cups: Use avahi and DBUS

These services are quite handy to make the printing
capabilities available to the network.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index b4a50bbb0e6cc1d405e4afadff5c568d986b94a3..3881d4aee8e88ae6fa2b4f98af351fafbfc76866 100644 (file)
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -1,3 +1,4 @@
+etc/dbus-1/system.d/cups.conf
 etc/pam.d/cups
 etc/rc.d/init.d/cups
 #etc/rc0.d
@@ -15,6 +16,7 @@ usr/bin/cancel
 #usr/bin/cups-config
 usr/bin/cupstestdsc
 usr/bin/cupstestppd
+usr/bin/ippfind
 usr/bin/ipptool
 usr/bin/lp
 usr/bin/lpoptions
@@ -45,8 +47,11 @@ usr/bin/ppdpo
 #usr/include/cups/versioning.h
 usr/lib/cups
 usr/lib/cups/backend
+usr/lib/cups/backend/dnssd
 usr/lib/cups/backend/http
+usr/lib/cups/backend/https
 usr/lib/cups/backend/ipp
+usr/lib/cups/backend/ipps
 usr/lib/cups/backend/lpd
 usr/lib/cups/backend/smb
 usr/lib/cups/backend/snmp
@@ -77,6 +82,7 @@ usr/lib/cups/monitor
 usr/lib/cups/monitor/bcp
 usr/lib/cups/monitor/tbcp
 usr/lib/cups/notifier
+usr/lib/cups/notifier/dbus
 usr/lib/cups/notifier/mailto
 usr/lib/cups/notifier/rss
 #usr/lib/libcups.so
@@ -103,7 +109,6 @@ usr/sbin/lpc
 usr/sbin/lpinfo
 usr/sbin/lpmove
 usr/sbin/reject
-#usr/share/applications/cups.desktop
 usr/share/cups
 usr/share/cups/banners
 usr/share/cups/data
@@ -717,6 +722,7 @@ usr/share/locale/ru/cups_ru.po
 #usr/share/man/man1/cups.1.gz
 #usr/share/man/man1/cupstestdsc.1.gz
 #usr/share/man/man1/cupstestppd.1.gz
+#usr/share/man/man1/ippfind.1.gz
 #usr/share/man/man1/ipptool.1.gz
 #usr/share/man/man1/lp.1.gz
 #usr/share/man/man1/lpoptions.1.gz

diff --git a/lfs/cups b/lfs/cups
index 5f900048b703cc0755d9ef03289284cd59bceef5..9a7e6069fa88f8db337c4d6cc663190a73c1c91e 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
 PAK_VER    = 15
 
-DEPS       = "cups-filters ghostscript"
+DEPS       = "avahi cups-filters dbus ghostscript krb5 libtiff"
 
 ###############################################################################
 # Top-level Rules
@@ -82,9 +82,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --prefix=/usr \
                        --sysconfdir=/var/ipfire \
                        --localstatedir=/var \
-                       --enable-libusb \
-                       --disable-dbus \
-                       --disable-avahi
+                       --enable-debug \
+                       --enable-avahi \
+                       --enable-dbus \
+                       --enable-gnutls \
+                       --enable-libusb
 
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install