summaryrefslogtreecommitdiff
path: root/package/cups
diff options
context:
space:
mode:
Diffstat (limited to 'package/cups')
-rw-r--r--package/cups/Makefile12
-rw-r--r--package/cups/patches/patch-Makefile20
-rw-r--r--package/cups/patches/patch-conf_Makefile18
-rw-r--r--package/cups/patches/patch-configure34
-rw-r--r--package/cups/patches/patch-ppdc_Makefile11
-rw-r--r--package/cups/patches/patch-scheduler_auth_c11
6 files changed, 47 insertions, 59 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 778c8fe47..608b043b7 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cups
-PKG_VERSION:= 1.3.10
+PKG_VERSION:= 1.4.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 84fffe96b8537c81a463faccead80026
+PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b
PKG_DESCR:= Common Unix Printing System
PKG_SECTION:= net
PKG_DEPENDS:= zlib libpthread
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_func_sigset=no \
OPTIM='-fPIC'
CONFIGURE_ARGS+= --with-cups-user=0 \
@@ -40,19 +40,19 @@ CONFIGURE_ARGS+= --with-cups-user=0 \
--disable-cdsassl \
--disable-dbus \
--disable-ssl
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true"
XAKE_FLAGS+= OPTIM='-fPIC'
post-install:
- ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups
${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin
${INSTALL_DIR} ${IDIR_CUPS}/etc/cups
${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/cgi-bin
${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon
${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/banners
+ ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups
${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/templates
${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/
rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default
diff --git a/package/cups/patches/patch-Makefile b/package/cups/patches/patch-Makefile
index 663b989b9..70febbf51 100644
--- a/package/cups/patches/patch-Makefile
+++ b/package/cups/patches/patch-Makefile
@@ -1,12 +1,16 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cups-1.3.10.orig/Makefile 2009-03-12 22:34:21.000000000 +0100
-+++ cups-1.3.10/Makefile 2009-05-09 22:41:42.000000000 +0200
-@@ -19,7 +19,7 @@ include Makedefs
+--- cups-1.4.2.orig/Makefile 2009-07-01 06:01:31.000000000 +0200
++++ cups-1.4.2/Makefile 2009-11-19 22:04:36.000000000 +0100
+@@ -27,10 +27,10 @@ include Makedefs
# Directories to make...
#
--DIRS = cups backend berkeley cgi-bin filter locale man monitor \
-+DIRS = cups backend berkeley cgi-bin filter locale monitor \
- notifier scheduler systemv test \
+-DIRS = cups filter backend berkeley cgi-bin driver locale man monitor \
+- notifier ppdc scheduler systemv test \
++DIRS = cups filter backend berkeley cgi-bin driver locale monitor \
++ notifier ppdc scheduler systemv \
$(PHPDIR) \
- conf data doc $(FONTS) ppd templates
+- conf data doc examples $(FONTS) templates
++ conf data examples doc $(FONTS) templates
+
+
+ #
diff --git a/package/cups/patches/patch-conf_Makefile b/package/cups/patches/patch-conf_Makefile
new file mode 100644
index 000000000..f3ae5c8dd
--- /dev/null
+++ b/package/cups/patches/patch-conf_Makefile
@@ -0,0 +1,18 @@
+--- cups-1.4.2.orig/conf/Makefile 2009-09-22 23:53:31.000000000 +0200
++++ cups-1.4.2/conf/Makefile 2009-11-19 22:02:20.000000000 +0100
+@@ -72,12 +72,12 @@ install: all install-data install-header
+ install-data:
+ for file in $(KEEP); do \
+ if test -r $(SERVERROOT)/$$file ; then \
+- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
++ $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
+ else \
+- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++ $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
+ fi ; \
+ done
+- $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
++ $(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
+ $(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ for file in $(REPLACE); do \
+ if test -r $(DATADIR)/mime/$$file ; then \
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure
deleted file mode 100644
index 82550e632..000000000
--- a/package/cups/patches/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cups-1.3.10.orig/configure 2009-04-16 22:02:06.000000000 +0200
-+++ cups-1.3.10/configure 2009-05-31 19:41:18.000000000 +0200
-@@ -7460,9 +7460,6 @@ done
-
-
- case $uname in
-- Darwin* | *BSD*)
-- ARFLAGS="-rcv"
-- ;;
- *)
- ARFLAGS="crvs"
- ;;
-@@ -9254,7 +9251,7 @@ if test "$libdir" = "\${exec_prefix}/lib
- ;;
- Linux*)
- if test -d /usr/lib64; then
-- libdir="$exec_prefix/lib64"
-+ libdir="$exec_prefix/lib"
- fi
- ;;
- HP-UX*)
-@@ -9587,11 +9584,6 @@ _ACEOF
-
- # Server executables...
- case "$uname" in
-- *BSD* | Darwin*)
-- # *BSD and Darwin (MacOS X)
-- INSTALL_SYSV=""
-- CUPS_SERVERBIN="$exec_prefix/libexec/cups"
-- ;;
- *)
- # All others
- INSTALL_SYSV="install-sysv"
diff --git a/package/cups/patches/patch-ppdc_Makefile b/package/cups/patches/patch-ppdc_Makefile
new file mode 100644
index 000000000..5cfa1ac9b
--- /dev/null
+++ b/package/cups/patches/patch-ppdc_Makefile
@@ -0,0 +1,11 @@
+--- cups-1.4.2.orig/ppdc/Makefile 2009-05-27 01:27:06.000000000 +0200
++++ cups-1.4.2/ppdc/Makefile 2009-11-19 21:58:49.000000000 +0100
+@@ -244,7 +244,7 @@ genstrings: genstrings.o libcupsppdc.a
+ libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
+ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+ echo Generating localization strings...
+- ./genstrings >sample.c
++ #./genstrings >sample.c
+
+
+ #
diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c
deleted file mode 100644
index c1f3a3e94..000000000
--- a/package/cups/patches/patch-scheduler_auth_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cups-1.3.10.orig/scheduler/auth.c 2009-02-07 06:06:11.000000000 +0100
-+++ cups-1.3.10/scheduler/auth.c 2009-06-01 19:17:20.000000000 +0200
-@@ -54,6 +54,7 @@
- * Include necessary headers...
- */
-
-+#define _GNU_SOURCE
- #include "cupsd.h"
- #include <grp.h>
- #ifdef HAVE_SHADOW_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:31:10 +0000