Only in cups-1.4.1: Makedefs
Only in cups-1.4.1: autom4te.cache
Only in cups-1.4.1/backend: http
Only in cups-1.4.1/backend: ieee1284.o
Only in cups-1.4.1/backend: ipp
diff --exclude configure -ur cups-1.4.1.orig/backend/ipp.c cups-1.4.1/backend/ipp.c
--- cups-1.4.1.orig/backend/ipp.c	2009-08-31 16:34:06.000000000 +0000
+++ cups-1.4.1/backend/ipp.c	2009-09-13 09:54:29.000000000 +0000
@@ -613,13 +613,13 @@
   fputs("STATE: -connecting-to-device\n", stderr);
   _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   if (http->hostaddr->addr.sa_family == AF_INET6)
     fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n",
 	    httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
 	    ntohs(http->hostaddr->ipv6.sin6_port));
   else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
     if (http->hostaddr->addr.sa_family == AF_INET)
       fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
 	      httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
Only in cups-1.4.1/backend: ipp.o
Only in cups-1.4.1/backend: libbackend.a
Only in cups-1.4.1/backend: lpd
diff --exclude configure -ur cups-1.4.1.orig/backend/lpd.c cups-1.4.1/backend/lpd.c
--- cups-1.4.1.orig/backend/lpd.c	2009-06-26 18:26:36.000000000 +0000
+++ cups-1.4.1/backend/lpd.c	2009-09-13 09:54:08.000000000 +0000
@@ -881,13 +881,13 @@
     fputs("STATE: -connecting-to-device\n", stderr);
     _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
     if (addr->addr.addr.sa_family == AF_INET6)
       fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6) (local port %d)...\n", 
 	      httpAddrString(&addr->addr, addrname, sizeof(addrname)),
 	      ntohs(addr->addr.ipv6.sin6_port), lport);
     else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
       if (addr->addr.addr.sa_family == AF_INET)
 	fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4) (local port %d)...\n",
 		httpAddrString(&addr->addr, addrname, sizeof(addrname)),
@@ -1310,11 +1310,11 @@
     * Set the port number...
     */
 
-#  ifdef AF_INET6
+#  ifdef HAVE_IPV6
     if (family == AF_INET6)
       addr.ipv6.sin6_port = htons(*port);
     else
-#  endif /* AF_INET6 */
+#  endif /* HAVE_IPV6 */
     addr.ipv4.sin_port = htons(*port);
 
    /*
Only in cups-1.4.1/backend: lpd.o
Only in cups-1.4.1/backend: network.o
Only in cups-1.4.1/backend: parallel
Only in cups-1.4.1/backend: parallel.o
Only in cups-1.4.1/backend: runloop.o
Only in cups-1.4.1/backend: scsi
Only in cups-1.4.1/backend: scsi.o
Only in cups-1.4.1/backend: snmp-supplies.o
diff --exclude configure -ur cups-1.4.1.orig/backend/socket.c cups-1.4.1/backend/socket.c
--- cups-1.4.1.orig/backend/socket.c	2009-06-12 04:02:45.000000000 +0000
+++ cups-1.4.1/backend/socket.c	2009-09-13 09:58:27.000000000 +0000
@@ -353,13 +353,13 @@
   fputs("STATE: -connecting-to-device\n", stderr);
   _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   if (addr->addr.addr.sa_family == AF_INET6)
     fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n", 
 	    httpAddrString(&addr->addr, addrname, sizeof(addrname)),
 	    ntohs(addr->addr.ipv6.sin6_port));
   else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
     if (addr->addr.addr.sa_family == AF_INET)
       fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
 	      httpAddrString(&addr->addr, addrname, sizeof(addrname)),
diff --exclude configure -ur cups-1.4.1.orig/backend/usb.c cups-1.4.1/backend/usb.c
--- cups-1.4.1.orig/backend/usb.c	2008-06-24 01:28:36.000000000 +0000
+++ cups-1.4.1/backend/usb.c	2009-09-13 09:58:55.000000000 +0000
@@ -61,6 +61,8 @@
 #  include "usb-darwin.c"
 #elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
 #  include "usb-unix.c"
+#elif defined(__HAIKU__)
+#  include "usb-haiku.c"
 #else
 /*
  * Use dummy functions that do nothing on unsupported platforms...
Only in cups-1.4.1/conf: cupsd.conf
Only in cups-1.4.1/conf: mime.convs
Only in cups-1.4.1/conf: pam.std
Only in cups-1.4.1/conf: snmp.conf
diff --exclude configure -ur cups-1.4.1.orig/config-scripts/cups-common.m4 cups-1.4.1/config-scripts/cups-common.m4
--- cups-1.4.1.orig/config-scripts/cups-common.m4	2009-09-11 20:06:51.000000000 +0000
+++ cups-1.4.1/config-scripts/cups-common.m4	2009-09-13 10:18:54.000000000 +0000
@@ -91,6 +91,7 @@
 dnl Check for libraries...
 AC_SEARCH_LIBS(crypt, crypt)
 AC_SEARCH_LIBS(getspent, sec gen)
+AC_SEARCH_LIBS(getpass, bsd)
 
 LIBMALLOC=""
 AC_ARG_ENABLE(mallinfo, [  --enable-mallinfo       build with malloc debug logging])
diff --exclude configure -ur cups-1.4.1.orig/config-scripts/cups-network.m4 cups-1.4.1/config-scripts/cups-network.m4
--- cups-1.4.1.orig/config-scripts/cups-network.m4	2008-09-08 22:03:01.000000000 +0000
+++ cups-1.4.1/config-scripts/cups-network.m4	2009-09-13 10:58:52.000000000 +0000
@@ -14,10 +14,10 @@
 dnl
 
 AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H))
-AC_SEARCH_LIBS(socket, socket)
-AC_SEARCH_LIBS(gethostbyaddr, nsl)
-AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
-AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR))
+AC_SEARCH_LIBS(socket, network socket)
+AC_SEARCH_LIBS(gethostbyaddr, network nsl)
+AC_SEARCH_LIBS(getifaddrs, nsl network, AC_DEFINE(HAVE_GETIFADDRS))
+AC_SEARCH_LIBS(hstrerror, nsl socket resolv network, AC_DEFINE(HAVE_HSTRERROR))
 AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF))
 AC_SEARCH_LIBS(__res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT),
 	AC_SEARCH_LIBS(res_9_init, resolv bind, AC_DEFINE(HAVE_RES_INIT),
@@ -25,7 +25,7 @@
 
 # Tru64 5.1b leaks file descriptors with these functions; disable until
 # we can come up with a test for this...
-if test "$uname" != "OSF1"; then
+if test "$uname" != "OSF1" -a "$uname" != "Haiku"; then
 	AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
 	AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
 fi
Only in cups-1.4.1: config.h
Only in cups-1.4.1: config.log
Only in cups-1.4.1: config.status
diff --exclude configure -ur cups-1.4.1.orig/cups/Makefile cups-1.4.1/cups/Makefile
--- cups-1.4.1.orig/cups/Makefile	2009-05-26 23:27:06.000000000 +0000
+++ cups-1.4.1/cups/Makefile	2009-09-13 10:27:59.000000000 +0000
@@ -348,7 +348,7 @@
 	echo Creating $@...
 	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o \
 		$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-		$(COMMONLIBS) $(LIBZ) -lm
+		$(COMMONLIBS) $(LIBZ)
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ libcups_s.o
 
diff --exclude configure -ur cups-1.4.1.orig/cups/adminutil.c cups-1.4.1/cups/adminutil.c
--- cups-1.4.1.orig/cups/adminutil.c	2009-08-29 06:05:14.000000000 +0000
+++ cups-1.4.1/cups/adminutil.c	2009-09-13 10:00:59.000000000 +0000
@@ -1042,9 +1042,9 @@
 #ifdef AF_LOCAL
             && *value != '/'
 #endif /* AF_LOCAL */
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
             && strcmp(value, "::1")
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
 	    )
 	  remote_access = 1;
       }
@@ -1125,9 +1125,9 @@
 #ifdef AF_LOCAL
 	       && *value != '/'
 #endif /* AF_LOCAL */
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
 	       && strcmp(value, "::1")
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
 	       )
       {
         if (in_admin_location)
Only in cups-1.4.1/cups: adminutil.o
Only in cups-1.4.1/cups: array.o
Only in cups-1.4.1/cups: attr.o
Only in cups-1.4.1/cups: auth.o
Only in cups-1.4.1/cups: backchannel.o
Only in cups-1.4.1/cups: backend.o
Only in cups-1.4.1/cups: conflicts.o
Only in cups-1.4.1/cups: custom.o
Only in cups-1.4.1/cups: debug.o
Only in cups-1.4.1/cups: dest.o
Only in cups-1.4.1/cups: dir.o
Only in cups-1.4.1/cups: emit.o
Only in cups-1.4.1/cups: encode.o
Only in cups-1.4.1/cups: file.o
Only in cups-1.4.1/cups: getdevices.o
Only in cups-1.4.1/cups: getifaddrs.o
Only in cups-1.4.1/cups: getputfile.o
Only in cups-1.4.1/cups: globals.o
diff --exclude configure -ur cups-1.4.1.orig/cups/http-addr.c cups-1.4.1/cups/http-addr.c
--- cups-1.4.1.orig/cups/http-addr.c	2009-04-20 21:37:14.000000000 +0000
+++ cups-1.4.1/cups/http-addr.c	2009-09-13 09:52:01.000000000 +0000
@@ -51,7 +51,7 @@
   if (!addr)
     return (0);
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   if (addr->addr.sa_family == AF_INET6 &&
       IN6_IS_ADDR_UNSPECIFIED(&(addr->ipv6.sin6_addr)))
     return (1);
@@ -89,7 +89,7 @@
     return (!strcmp(addr1->un.sun_path, addr2->un.sun_path));
 #endif /* AF_LOCAL */
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   if (addr1->addr.sa_family == AF_INET6)
     return (!memcmp(&(addr1->ipv6.sin6_addr), &(addr2->ipv6.sin6_addr), 16));
 #endif /* AF_INET6 */
@@ -110,7 +110,7 @@
   if (!addr)
     return (0);
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   if (addr->addr.sa_family == AF_INET6)
     return (sizeof(addr->ipv6));
   else
@@ -142,7 +142,7 @@
   if (!addr)
     return (1);
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   if (addr->addr.sa_family == AF_INET6 &&
       IN6_IS_ADDR_LOOPBACK(&(addr->ipv6.sin6_addr)))
     return (1);
@@ -264,7 +264,7 @@
     struct hostent	*host;			/* Host from name service */
 
 
-#  ifdef AF_INET6
+#  ifdef HAVE_IPV6
     if (addr->addr.sa_family == AF_INET6)
       host = gethostbyaddr(ADDR_CAST &(addr->ipv6.sin6_addr),
                 	   sizeof(struct in_addr), AF_INET6);
@@ -304,7 +304,7 @@
 {
   if (!addr)
     return (ippPort());
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   else if (addr->addr.sa_family == AF_INET6)
     return (ntohs(addr->ipv6.sin6_port));
 #endif /* AF_INET6 */
@@ -355,7 +355,7 @@
     snprintf(s, slen, "%d.%d.%d.%d", (temp >> 24) & 255,
              (temp >> 16) & 255, (temp >> 8) & 255, temp & 255);
   }
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   else if (addr->addr.sa_family == AF_INET6)
   {
 #  ifdef HAVE_GETNAMEINFO
Only in cups-1.4.1/cups: http-addr.o
diff --exclude configure -ur cups-1.4.1.orig/cups/http-addrlist.c cups-1.4.1/cups/http-addrlist.c
--- cups-1.4.1.orig/cups/http-addrlist.c	2009-04-20 21:37:14.000000000 +0000
+++ cups-1.4.1/cups/http-addrlist.c	2009-09-13 09:59:56.000000000 +0000
@@ -216,9 +216,9 @@
 #  ifdef AF_LOCAL
 	                 family == AF_LOCAL ? "LOCAL" :
 #  endif /* AF_LOCAL */
-#  ifdef AF_INET6
+#  ifdef HAVE_IPV6
 	                 family == AF_INET6 ? "INET6" :
-#  endif /* AF_INET6 */
+#  endif /* HAVE_IPV6 */
 	                 family == AF_INET ? "INET" : "???", service);
 #endif /* DEBUG */
 
@@ -443,7 +443,7 @@
 	}
       }
       else if ((host = gethostbyname(hostname)) != NULL &&
-#  ifdef AF_INET6
+#  ifdef HAVE_IPV6
                (host->h_addrtype == AF_INET || host->h_addrtype == AF_INET6))
 #  else
                host->h_addrtype == AF_INET)
@@ -462,7 +462,7 @@
 	    return (NULL);
 	  }
 
-#  ifdef AF_INET6
+#  ifdef HAVE_IPV6
           if (host->h_addrtype == AF_INET6)
 	  {
             temp->addr.ipv6.sin6_family = AF_INET6;
@@ -540,7 +540,7 @@
       * IPv4 loopback interface addresses...
       */
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
       if (family != AF_INET)
       {
        /*
@@ -599,7 +599,7 @@
       * Provide one or more passive listening addresses...
       */
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
       if (family != AF_INET)
       {
        /*
@@ -623,7 +623,7 @@
       }
 
       if (family != AF_INET6)
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
       {
        /*
         * Add 0.0.0.0 to the address list...
Only in cups-1.4.1/cups: http-addrlist.o
Only in cups-1.4.1/cups: http-support.o
diff --exclude configure -ur cups-1.4.1.orig/cups/http.h cups-1.4.1/cups/http.h
--- cups-1.4.1.orig/cups/http.h	2009-06-22 20:40:28.000000000 +0000
+++ cups-1.4.1/cups/http.h	2009-09-13 10:00:34.000000000 +0000
@@ -85,7 +85,7 @@
  * platforms.
  */
 
-#if defined(AF_INET6) && !defined(s6_addr32)
+#if defined(HAVE_IPV6) && !defined(s6_addr32)
 #  if defined(__sun)
 #    define s6_addr32	_S6_un._S6_u32
 #  elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
@@ -99,7 +99,7 @@
  */
 #    define s6_addr32	error_need_win32_specific_code
 #  endif /* __sun */
-#endif /* AF_INET6 && !s6_addr32 */
+#endif /* HAVE_IPV6 && !s6_addr32 */
 
 
 /*
@@ -296,9 +296,9 @@
 {
   struct sockaddr	addr;		/* Base structure for family value */
   struct sockaddr_in	ipv4;		/* IPv4 address */
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   struct sockaddr_in6	ipv6;		/* IPv6 address */
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
 #ifdef AF_LOCAL
   struct sockaddr_un	un;		/* Domain socket file */
 #endif /* AF_LOCAL */
Only in cups-1.4.1/cups: http.o
Only in cups-1.4.1/cups: ipp-support.o
Only in cups-1.4.1/cups: ipp.o
Only in cups-1.4.1/cups: langprintf.o
Only in cups-1.4.1/cups: language.o
Only in cups-1.4.1/cups: libcups.a
Only in cups-1.4.1/cups: libcups.so
Only in cups-1.4.1/cups: libcups.so.2
Only in cups-1.4.1/cups: localize.o
Only in cups-1.4.1/cups: mark.o
Only in cups-1.4.1/cups: md5.o
Only in cups-1.4.1/cups: md5passwd.o
Only in cups-1.4.1/cups: notify.o
Only in cups-1.4.1/cups: options.o
Only in cups-1.4.1/cups: page.o
Only in cups-1.4.1/cups: ppd.o
Only in cups-1.4.1/cups: pwgmedia.o
Only in cups-1.4.1/cups: request.o
Only in cups-1.4.1/cups: sidechannel.o
diff --exclude configure -ur cups-1.4.1.orig/cups/snmp.c cups-1.4.1/cups/snmp.c
--- cups-1.4.1.orig/cups/snmp.c	2009-08-31 16:34:06.000000000 +0000
+++ cups-1.4.1/cups/snmp.c	2009-09-13 10:04:52.000000000 +0000
@@ -757,11 +757,11 @@
 
   temp = *address;
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   if (temp.addr.sa_family == AF_INET6)
     temp.ipv6.sin6_port = htons(CUPS_SNMP_PORT);
   else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
   temp.ipv4.sin_port = htons(CUPS_SNMP_PORT);
 
   return (sendto(fd, buffer, bytes, 0, (void *)&temp,
Only in cups-1.4.1/cups: snmp.o
Only in cups-1.4.1/cups: snprintf.o
Only in cups-1.4.1/cups: string.o
Only in cups-1.4.1/cups: tempfile.o
Only in cups-1.4.1/cups: transcode.o
Only in cups-1.4.1/cups: usersys.o
Only in cups-1.4.1/cups: util.o
Only in cups-1.4.1: cups-config
Only in cups-1.4.1/data: testprint
Only in cups-1.4.1/desktop: cups.desktop
Only in cups-1.4.1/doc/de: index.html
Only in cups-1.4.1/doc/es: index.html
Only in cups-1.4.1/doc/eu: index.html
Only in cups-1.4.1/doc/help: ref-cupsd-conf.html
Only in cups-1.4.1/doc/help: standard.html
Only in cups-1.4.1/doc: index.html
Only in cups-1.4.1/doc/ja: index.html
Only in cups-1.4.1/doc/pl: index.html
Only in cups-1.4.1/doc/ru: index.html
diff --exclude configure -ur cups-1.4.1.orig/filter/Makefile cups-1.4.1/filter/Makefile
--- cups-1.4.1.orig/filter/Makefile	2009-05-26 23:27:06.000000000 +0000
+++ cups-1.4.1/filter/Makefile	2009-09-13 10:28:45.000000000 +0000
@@ -298,7 +298,7 @@
 
 formtops:	$(FORMOBJS) common.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ $(FORMOBJS) common.o $(LIBS) -lm
+	$(CC) $(LDFLAGS) -o $@ $(FORMOBJS) common.o $(LIBS)
 
 
 #
@@ -316,7 +316,7 @@
 
 hpgltops:	$(HPGLOBJS) common.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm
+	$(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS)
 
 
 #
@@ -326,7 +326,7 @@
 libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS)
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
-		-L../cups $(LINKCUPS) -lm
+		-L../cups $(LINKCUPS)
 	$(RM) `basename $@ .2`
 	$(LN) $@ `basename $@ .2`
 
@@ -339,7 +339,7 @@
 	echo Linking 32-bit $@...
 	-mkdir 32bit
 	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
-		-L../cups/32bit $(LINKCUPS) -lm
+		-L../cups/32bit $(LINKCUPS)
 
 
 #
@@ -350,7 +350,7 @@
 	echo Linking 64-bit $@...
 	-mkdir 64bit
 	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) \
-		-L../cups/64bit $(LINKCUPS) -lm
+		-L../cups/64bit $(LINKCUPS)
 
 
 #
@@ -364,7 +364,7 @@
 		-current_version 2.3.0 \
 		-compatibility_version 2.0.0 \
 		-sectorder __TEXT __text $(LIBCUPSIMAGEORDER) \
-		$(IMAGEOBJS) $(DSOLIBS) -L../cups $(LINKCUPS) -lm
+		$(IMAGEOBJS) $(DSOLIBS) -L../cups $(LINKCUPS)
 	$(RM) libcupsimage.dylib
 	$(LN) $@ libcupsimage.dylib
 
@@ -376,7 +376,7 @@
 libcupsimage_s.a:	$(IMAGEOBJS) libcupsimage_s.exp
 	echo Linking $@...
 	$(DSO) $(DSOFLAGS) -Wl,-berok,-bexport:libcupsimage_s.exp \
-		-o libcupsimage_s.o $(IMAGEOBJS) $(DSOLIBS) -lm
+		-o libcupsimage_s.o $(IMAGEOBJS) $(DSOLIBS)
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ libcupsimage_s.o
 
@@ -441,7 +441,7 @@
 
 pstops:	pstops.o common.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS) -lm
+	$(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS)
 
 
 #
Only in cups-1.4.1/filter: bannertops
Only in cups-1.4.1/filter: bannertops.o
Only in cups-1.4.1/filter: commandtops
Only in cups-1.4.1/filter: commandtops.o
Only in cups-1.4.1/filter: common.o
Only in cups-1.4.1/filter: error.o
Only in cups-1.4.1/filter: gziptoany
Only in cups-1.4.1/filter: gziptoany.o
Only in cups-1.4.1/filter: hpgl-attr.o
Only in cups-1.4.1/filter: hpgl-char.o
Only in cups-1.4.1/filter: hpgl-config.o
Only in cups-1.4.1/filter: hpgl-input.o
Only in cups-1.4.1/filter: hpgl-main.o
Only in cups-1.4.1/filter: hpgl-polygon.o
Only in cups-1.4.1/filter: hpgl-prolog.o
Only in cups-1.4.1/filter: hpgl-vector.o
Only in cups-1.4.1/filter: hpgltops
Only in cups-1.4.1/filter: image-bmp.o
Only in cups-1.4.1/filter: image-colorspace.o
Only in cups-1.4.1/filter: image-gif.o
Only in cups-1.4.1/filter: image-jpeg.o
Only in cups-1.4.1/filter: image-photocd.o
Only in cups-1.4.1/filter: image-pix.o
Only in cups-1.4.1/filter: image-png.o
Only in cups-1.4.1/filter: image-pnm.o
Only in cups-1.4.1/filter: image-sgi.o
Only in cups-1.4.1/filter: image-sgilib.o
Only in cups-1.4.1/filter: image-sun.o
Only in cups-1.4.1/filter: image-tiff.o
Only in cups-1.4.1/filter: image-zoom.o
Only in cups-1.4.1/filter: image.o
Only in cups-1.4.1/filter: imagetops
Only in cups-1.4.1/filter: imagetops.o
Only in cups-1.4.1/filter: imagetoraster
Only in cups-1.4.1/filter: imagetoraster.o
Only in cups-1.4.1/filter: interpret.o
Only in cups-1.4.1/filter: libcupsimage.a
Only in cups-1.4.1/filter: libcupsimage.so
Only in cups-1.4.1/filter: libcupsimage.so.2
Only in cups-1.4.1/filter: pstext.o
Only in cups-1.4.1/filter: pstops
Only in cups-1.4.1/filter: pstops.o
Only in cups-1.4.1/filter: raster.o
Only in cups-1.4.1/filter: rastertoepson
Only in cups-1.4.1/filter: rastertoepson.o
Only in cups-1.4.1/filter: rastertohp
Only in cups-1.4.1/filter: rastertohp.o
Only in cups-1.4.1/filter: rastertolabel
Only in cups-1.4.1/filter: rastertolabel.o
Only in cups-1.4.1/filter: textcommon.o
Only in cups-1.4.1/filter: texttops
Only in cups-1.4.1/filter: texttops.o
Only in cups-1.4.1/init: cups-lpd
Only in cups-1.4.1/init: cups.sh
Only in cups-1.4.1/init: cups.xml
Only in cups-1.4.1/init: org.cups.cups-lpd.plist
Only in cups-1.4.1/man: client.conf.man
Only in cups-1.4.1/man: cups-deviced.man
Only in cups-1.4.1/man: cups-driverd.man
Only in cups-1.4.1/man: cups-lpd.man
Only in cups-1.4.1/man: cupsaddsmb.man
Only in cups-1.4.1/man: cupsd.conf.man
Only in cups-1.4.1/man: cupsd.man
Only in cups-1.4.1/man: drv.man
Only in cups-1.4.1/man: lpoptions.man
Only in cups-1.4.1/packaging: cups.list
diff --exclude configure -ur cups-1.4.1.orig/scheduler/client.c cups-1.4.1/scheduler/client.c
--- cups-1.4.1.orig/scheduler/client.c	2009-07-14 23:02:05.000000000 +0000
+++ cups-1.4.1/scheduler/client.c	2009-09-13 10:02:03.000000000 +0000
@@ -207,7 +207,7 @@
     return;
   }
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   if (lis->address.addr.sa_family == AF_INET6)
   {
    /*
@@ -227,7 +227,7 @@
       con->http.hostaddr->ipv6.sin6_addr.s6_addr32[2] = 0;
   }
   else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
   if (lis->address.addr.sa_family == AF_INET)
     con->http.hostaddr->ipv4.sin_port = lis->address.ipv4.sin_port;
 
@@ -385,13 +385,13 @@
   }
 #endif /* HAVE_TCPD_H */
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
   if (con->http.hostaddr->addr.sa_family == AF_INET6)
     cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
                     con->http.fd, con->http.hostname,
 		    ntohs(con->http.hostaddr->ipv6.sin6_port));
   else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
 #ifdef AF_LOCAL
   if (con->http.hostaddr->addr.sa_family == AF_LOCAL)
     cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s (Domain)",
@@ -417,7 +417,7 @@
   }
   else
   {
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
     if (temp.addr.sa_family == AF_INET6)
     {
       if (httpAddrLocalhost(&temp))
@@ -430,7 +430,7 @@
       con->serverport = ntohs(lis->address.ipv6.sin6_port);
     }
     else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
     if (temp.addr.sa_family == AF_INET)
     {
       if (httpAddrLocalhost(&temp))
diff --exclude configure -ur cups-1.4.1.orig/scheduler/conf.c cups-1.4.1/scheduler/conf.c
--- cups-1.4.1.orig/scheduler/conf.c	2009-05-26 15:41:04.000000000 +0000
+++ cups-1.4.1/scheduler/conf.c	2009-09-13 10:03:50.000000000 +0000
@@ -1570,7 +1570,7 @@
   else
     maskval = value + strlen(value);
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
  /*
   * Check for an IPv6 address...
   */
@@ -1624,7 +1624,7 @@
       return (0);
   }
   else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
   {
    /*
     * Parse dotted-decimal IPv4 address...
@@ -1693,7 +1693,7 @@
 
       i = atoi(maskval);
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
       if (family == AF_INET6)
       {
         if (i > 128)
@@ -1728,7 +1728,7 @@
 	  mask[3] = (0xffffffff << i) & 0xffffffff;
       }
       else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
       {
         if (i > 32)
 	  return (0);
@@ -1895,12 +1895,12 @@
 	else
 	  cupsdDenyIP(loc, ones, zeros);
       }
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
       else if (value[0] == '*' || value[0] == '.' || 
 	       (!isdigit(value[0] & 255) && value[0] != '['))
 #else
       else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
       {
        /*
 	* Host or domain name...
@@ -2577,12 +2577,12 @@
 
 	httpAddrString(&lis->address, temp, sizeof(temp));
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
         if (lis->address.addr.sa_family == AF_INET6)
           cupsdLogMessage(CUPSD_LOG_INFO, "Listening to %s:%d (IPv6)", temp,
                           ntohs(lis->address.ipv6.sin6_port));
 	else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
 #ifdef AF_LOCAL
         if (lis->address.addr.sa_family == AF_LOCAL)
           cupsdLogMessage(CUPSD_LOG_INFO, "Listening to %s (Domain)", temp);
@@ -2593,11 +2593,11 @@
 
         if (!httpAddrLocalhost(&(lis->address)))
 	{
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
 	  if (lis->address.addr.sa_family == AF_INET6)
 	    RemotePort = ntohs(lis->address.ipv6.sin6_port);
 	  else
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
 	  RemotePort = ntohs(lis->address.ipv4.sin_port);
 	}
       }
@@ -2815,12 +2815,12 @@
 	    else
 	      cupsdDenyIP(location, ones, zeros);
 	  }
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
 	  else if (value[0] == '*' || value[0] == '.' || 
 		   (!isdigit(value[0] & 255) && value[0] != '['))
 #else
 	  else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
 	  {
 	   /*
 	    * Host or domain name...
@@ -2911,12 +2911,12 @@
       *    nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
       */
 
-#ifdef AF_INET6
+#ifdef HAVE_IPV6
       if (value[0] == '*' || value[0] == '.' || 
           (!isdigit(value[0] & 255) && value[0] != '['))
 #else
       if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
-#endif /* AF_INET6 */
+#endif /* HAVE_IPV6 */
       {
        /*
         * Host or domain name...
diff --exclude configure -ur cups-1.4.1.orig/scheduler/env.c cups-1.4.1/scheduler/env.c
--- cups-1.4.1.orig/scheduler/env.c	2009-06-15 17:13:52.000000000 +0000
+++ cups-1.4.1/scheduler/env.c	2009-09-13 10:07:05.000000000 +0000
@@ -81,11 +81,16 @@
   cupsdSetEnv("CUPS_SERVERBIN", ServerBin);
   cupsdSetEnv("CUPS_SERVERROOT", ServerRoot);
   cupsdSetEnv("CUPS_STATEDIR", StateDir);
+#ifdef __HAIKU__
+  cupsdSetEnv("LIBRARY_PATH", NULL);
+  cupsdSetEnv("ADDON_PATH", NULL);
+#else
   cupsdSetEnv("DYLD_LIBRARY_PATH", NULL);
   cupsdSetEnv("HOME", TempDir);
   cupsdSetEnv("LD_ASSUME_KERNEL", NULL);
   cupsdSetEnv("LD_LIBRARY_PATH", NULL);
   cupsdSetEnv("LD_PRELOAD", NULL);
+#endif  /* __HAIKU__ */
   cupsdSetEnv("NLSPATH", NULL);
   cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
                        ":/bin:/usr/bin", ServerBin);
diff --exclude configure -ur cups-1.4.1.orig/scheduler/process.c cups-1.4.1/scheduler/process.c
--- cups-1.4.1.orig/scheduler/process.c	2009-05-16 03:04:48.000000000 +0000
+++ cups-1.4.1/scheduler/process.c	2009-09-13 10:08:09.000000000 +0000
@@ -437,6 +437,7 @@
       fcntl(4, F_SETFL, O_NDELAY);
     }
 
+#ifndef __HAIKU__
    /*
     * Change the priority of the process based on the FilterNice setting.
     * (this is not done for root processes...)
@@ -497,6 +498,7 @@
     */
 
     umask(077);
+#endif  /* __HAIKU__ */
 
    /*
     * Unblock signals before doing the exec...
Only in cups-1.4.1/templates/de: header.tmpl
Only in cups-1.4.1/templates/es: header.tmpl
Only in cups-1.4.1/templates/eu: header.tmpl
Only in cups-1.4.1/templates: header.tmpl
Only in cups-1.4.1/templates/ja: header.tmpl
Only in cups-1.4.1/templates/pl: header.tmpl
Only in cups-1.4.1/templates/ru: header.tmpl
