cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to cups-1.4.4.

Browse Source 
Fixes several security, scheduler, printing, and conformance issues.
This commit is contained in:
ajacoutot 2010-06-27 04:18:50 +00:00
parent 0513239721
commit eebf14a545
8 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
print/cups/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.73 2010/05/22 09:57:42 jasper Exp $
# $OpenBSD: Makefile,v 1.74 2010/06/27 04:18:50 ajacoutot Exp $
COMMENT= Common Unix Printing System
VERSION= 1.4.3
VERSION= 1.4.4
DISTNAME= cups-${VERSION}-source
PKGNAME= cups-${VERSION}p3
PKGNAME= cups-${VERSION}
CATEGORIES= print sysutils

10
print/cups/distinfo
View File

@ -1,5 +1,5 @@
MD5 (cups-1.4.3-source.tar.bz2) = 5wscP2AUPXMQwddMERohqw==
RMD160 (cups-1.4.3-source.tar.bz2) = bFqygkBdahEyFjxydYPzpXIwfYg=
SHA1 (cups-1.4.3-source.tar.bz2) = Ddnj1wlhTSbM53couSY1VslMlVk=
SHA256 (cups-1.4.3-source.tar.bz2) = R6VZscUBkrlEea59qxMuoACHJwRdSZNQHPCm3wxk25c=
SIZE (cups-1.4.3-source.tar.bz2) = 4461101
MD5 (cups-1.4.4-source.tar.bz2) = h3ZAOtYP6p6F6rnATYhWDQ==
RMD160 (cups-1.4.4-source.tar.bz2) = H0hqzaAug7aCT4yjO3TAL/PwGZQ=
SHA1 (cups-1.4.4-source.tar.bz2) = PhecAH+mzWh0tg/xim9IBwVHoAo=
SHA256 (cups-1.4.4-source.tar.bz2) = 0l/6Na3Tq+7sDrpgviz/yJQltknGTvOnPfxyRoOlmqM=
SIZE (cups-1.4.4-source.tar.bz2) = 4472741

8
print/cups/patches/patch-config-scripts_cups-common_m4
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.1 2010/03/31 16:20:02 ajacoutot Exp $
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.2 2010/06/27 04:18:50 ajacoutot Exp $
STR #3447: dbus notifier no longer builds
--- config-scripts/cups-common.m4.orig Tue Mar 30 22:40:58 2010
+++ config-scripts/cups-common.m4 Wed Mar 31 15:53:42 2010
@@ -268,6 +268,8 @@ if test "x$enable_dbus" != xno; then
--- config-scripts/cups-common.m4.orig Thu Jun 17 20:25:43 2010
+++ config-scripts/cups-common.m4 Sun Jun 27 06:09:50 2010
@@ -276,6 +276,8 @@ if test "x$enable_dbus" != xno; then
dbus_message_iter_init_append,
AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
`$PKGCONFIG --libs dbus-1`)

14
print/cups/patches/patch-cups_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cups_Makefile,v 1.6 2010/03/31 16:20:02 ajacoutot Exp $
--- cups/Makefile.orig Wed May 27 01:27:06 2009
+++ cups/Makefile Sun Aug 30 16:46:01 2009
@@ -222,10 +222,6 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL6
$OpenBSD: patch-cups_Makefile,v 1.7 2010/06/27 04:18:50 ajacoutot Exp $
--- cups/Makefile.orig Fri Apr 23 20:56:34 2010
+++ cups/Makefile Sun Jun 27 06:09:50 2010
@@ -225,10 +225,6 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL6
echo Installing libraries in $(LIBDIR)...
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
@ -12,7 +12,7 @@ $OpenBSD: patch-cups_Makefile,v 1.6 2010/03/31 16:20:02 ajacoutot Exp $
if test $(LIBCUPS) = "libcups.2.dylib"; then \
$(RM) $(LIBDIR)/libcups.dylib; \
$(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
@@ -244,14 +240,14 @@ installstatic:
@@ -247,14 +243,14 @@ installstatic:
install32bit:
echo Installing libraries in $(LIB32DIR)...
$(INSTALL_DIR) -m 755 $(LIB32DIR)
@ -31,7 +31,7 @@ $OpenBSD: patch-cups_Makefile,v 1.6 2010/03/31 16:20:02 ajacoutot Exp $
#
@@ -266,7 +262,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
@@ -269,7 +265,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
$(RM) $(LIBDIR)/libcups.sl
$(RM) $(LIBDIR)/libcups.sl.2
$(RM) $(LIBDIR)/libcups.so
@ -40,7 +40,7 @@ $OpenBSD: patch-cups_Makefile,v 1.6 2010/03/31 16:20:02 ajacoutot Exp $
-$(RMDIR) $(LIBDIR)
for file in $(HEADERS); do \
$(RM) $(INCLUDEDIR)/cups/$$file; \
@@ -275,51 +271,49 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
@@ -278,51 +274,49 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
uninstall32bit:
$(RM) $(LIB32DIR)/libcups.so

12
print/cups/patches/patch-driver_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-driver_Makefile,v 1.1 2010/03/31 16:20:02 ajacoutot Exp $
--- driver/Makefile.orig Wed May 27 01:27:06 2009
+++ driver/Makefile Sun Aug 30 16:46:11 2009
@@ -149,10 +149,6 @@ install-libs: $(INSTALLSTATIC)
$OpenBSD: patch-driver_Makefile,v 1.2 2010/06/27 04:18:50 ajacoutot Exp $
--- driver/Makefile.orig Fri Apr 23 20:56:34 2010
+++ driver/Makefile Sun Jun 27 06:09:50 2010
@@ -151,10 +151,6 @@ install-libs: $(INSTALLSTATIC)
echo Installing libraries in $(LIBDIR)...
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPSDRIVER) $(LIBDIR)
@ -12,7 +12,7 @@ $OpenBSD: patch-driver_Makefile,v 1.1 2010/03/31 16:20:02 ajacoutot Exp $
if test $(LIBCUPSDRIVER) = "libcupsdriver.1.dylib"; then \
$(RM) $(LIBDIR)/libcupsdriver.dylib; \
$(LN) $(LIBCUPSDRIVER) $(LIBDIR)/libcupsdriver.dylib; \
@@ -184,7 +180,7 @@ uninstall:
@@ -186,7 +182,7 @@ uninstall:
$(RM) $(LIBDIR)/libcupsdriver.sl
$(RM) $(LIBDIR)/libcupsdriver.sl.1
$(RM) $(LIBDIR)/libcupsdriver.so
@ -21,7 +21,7 @@ $OpenBSD: patch-driver_Makefile,v 1.1 2010/03/31 16:20:02 ajacoutot Exp $
-$(RMDIR) $(LIBDIR)
$(RM) $(INCLUDEDIR)/cups/driver.h
-$(RMDIR) $(INCLUDEDIR)/cups
@@ -310,14 +306,12 @@ testrgb: test testrgb.o libcupsdriver.a ../cups/libcu
@@ -312,14 +308,12 @@ testrgb: test testrgb.o libcupsdriver.a ../cups/libcu
#

14
print/cups/patches/patch-filter_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-filter_Makefile,v 1.7 2010/03/31 16:20:02 ajacoutot Exp $
--- filter/Makefile.orig Wed May 27 01:27:06 2009
+++ filter/Makefile Sun Aug 30 16:46:22 2009
$OpenBSD: patch-filter_Makefile,v 1.8 2010/06/27 04:18:50 ajacoutot Exp $
--- filter/Makefile.orig Fri Apr 23 20:56:34 2010
+++ filter/Makefile Sun Jun 27 06:09:50 2010
@@ -153,10 +153,6 @@ install-headers:
install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
$(INSTALL_DIR) -m 755 $(LIBDIR)
@ -12,7 +12,7 @@ $OpenBSD: patch-filter_Makefile,v 1.7 2010/03/31 16:20:02 ajacoutot Exp $
-if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
$(RM) $(LIBDIR)/libcupsimage.dylib; \
$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
@@ -170,13 +166,13 @@ installstatic:
@@ -174,13 +170,13 @@ installstatic:
install32bit:
$(INSTALL_DIR) -m 755 $(LIB32DIR)
@ -30,7 +30,7 @@ $OpenBSD: patch-filter_Makefile,v 1.7 2010/03/31 16:20:02 ajacoutot Exp $
#
@@ -197,19 +193,19 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
@@ -201,19 +197,19 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
$(RM) $(LIBDIR)/libcupsimage.sl
$(RM) $(LIBDIR)/libcupsimage.sl.2
$(RM) $(LIBDIR)/libcupsimage.so
@ -53,7 +53,7 @@ $OpenBSD: patch-filter_Makefile,v 1.7 2010/03/31 16:20:02 ajacoutot Exp $
-$(RMDIR) $(LIB64DIR)
@@ -320,22 +316,20 @@ hpgltops: $(HPGLOBJS) common.o ../cups/$(LIBCUPS)
@@ -324,22 +320,20 @@ hpgltops: $(HPGLOBJS) common.o ../cups/$(LIBCUPS)
#
@ -80,7 +80,7 @@ $OpenBSD: patch-filter_Makefile,v 1.7 2010/03/31 16:20:02 ajacoutot Exp $
echo Linking 32-bit $@...
-mkdir 32bit
$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
@@ -343,10 +337,10 @@ libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS)
@@ -347,10 +341,10 @@ libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS)
#

14
print/cups/patches/patch-scheduler_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scheduler_Makefile,v 1.5 2010/03/31 16:20:02 ajacoutot Exp $
--- scheduler/Makefile.orig Wed May 27 01:27:06 2009
+++ scheduler/Makefile Sun Aug 30 16:47:04 2009
@@ -147,21 +147,6 @@ install-data:
$OpenBSD: patch-scheduler_Makefile,v 1.6 2010/06/27 04:18:50 ajacoutot Exp $
--- scheduler/Makefile.orig Fri Apr 23 20:56:34 2010
+++ scheduler/Makefile Sun Jun 27 06:09:51 2010
@@ -150,21 +150,6 @@ install-data:
echo Creating $(SERVERROOT)/ssl...; \
$(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
fi
@ -23,7 +23,7 @@ $OpenBSD: patch-scheduler_Makefile,v 1.5 2010/03/31 16:20:02 ajacoutot Exp $
#
@@ -210,10 +195,6 @@ install-libs: $(INSTALLSTATIC)
@@ -213,10 +198,6 @@ install-libs: $(INSTALLSTATIC)
echo Installing libraries in $(LIBDIR)...
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR)
@ -34,7 +34,7 @@ $OpenBSD: patch-scheduler_Makefile,v 1.5 2010/03/31 16:20:02 ajacoutot Exp $
if test $(LIBCUPSMIME) = "libcupsmime.1.dylib"; then \
$(RM) $(LIBDIR)/libcupsmime.dylib; \
$(LN) $(LIBCUPSMIME) $(LIBDIR)/libcupsmime.dylib; \
@@ -262,7 +243,7 @@ uninstall:
@@ -265,7 +246,7 @@ uninstall:
$(RM) $(LIBDIR)/libcupsmime.sl
$(RM) $(LIBDIR)/libcupsmime.sl.1
$(RM) $(LIBDIR)/libcupsmime.so
@ -43,7 +43,7 @@ $OpenBSD: patch-scheduler_Makefile,v 1.5 2010/03/31 16:20:02 ajacoutot Exp $
-$(RMDIR) $(LIBDIR)
$(RM) $(INCLUDEDIR)/cups/mime.h
-$(RMDIR) $(INCLUDEDIR)/cups
@@ -359,14 +340,12 @@ cups-polld: cups-polld.o ../cups/$(LIBCUPS)
@@ -362,14 +343,12 @@ cups-polld: cups-polld.o ../cups/$(LIBCUPS)
#

8
print/cups/patches/patch-scheduler_ipp_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-scheduler_ipp_c,v 1.3 2010/03/31 16:20:02 ajacoutot Exp $
$OpenBSD: patch-scheduler_ipp_c,v 1.4 2010/06/27 04:18:50 ajacoutot Exp $
Increase timeout for the PPD file to be copied so that it doesn't fail
on low-end configurations.
--- scheduler/ipp.c.orig Mon Jan 18 17:18:29 2010
+++ scheduler/ipp.c Wed Mar 31 15:53:43 2010
@@ -5152,7 +5152,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
--- scheduler/ipp.c.orig Fri Apr 23 20:56:34 2010
+++ scheduler/ipp.c Sun Jun 27 06:09:51 2010
@@ -5245,7 +5245,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
FD_SET(temppipe[0], &input);
FD_SET(CGIPipes[0], &input);