Package: cupsys
Version: 1.1.23-12
Severity: important
Tags: patch
The following patch adds support for FreeBSD devices when compiling and
running on GNU/kFreeBSD. FreeBSD is already supported upstream; we
simply needed to use the proper macro. Please apply the attached patch.
-- System Information:
Debian Release: testing/unstable
Architecture: kfreebsd-i386 (i686)
Shell: /bin/sh linked to /bin/dash
Kernel: GNU/kFreeBSD 5.4-1-686
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Versions of packages cupsys depends on:
ii adduser 3.77 Add and remove users and groups
ii debconf [debconf-2.0] 1.4.58 Debian configuration management sy
pn gs-esp <none> (no description available)
ii libc0.1 2.3-1+kbsd.11 GNU C Library: Shared libraries an
ii libcupsimage2 1.1.23-12 Common UNIX Printing System(tm) -
ii libcupsys2 1.1.23-12 Common UNIX Printing System(tm) -
ii libgnutls12 1.2.8-1 the GNU TLS library - runtime libr
ii libpam0g 0.76-15 Pluggable Authentication Modules l
ii libpaper1 1.1.14-3 Library for handling paper charact
ii patch 2.5.9-2.0.1 Apply a diff file to an original
ii perl-modules 5.8.7-7 Core Perl modules
ii procps 1:3.2.6-2 /proc file system utilities
ii xpdf-utils 3.01-2 Portable Document Format (PDF) sui
ii zlib1g 1:1.2.3-6 compression library - runtime
Versions of packages cupsys recommends:
ii cupsys-client 1.1.23-12 Common UNIX Printing System(tm) -
ii foomatic-filters 3.0.2-20050720-1 linuxprinting.org printer support
pn smbclient <none> (no description available)
diff -ur cupsys-1.1.23.old/backend/parallel.c cupsys-1.1.23/backend/parallel.c
--- cupsys-1.1.23.old/backend/parallel.c 2005-11-08 07:37:16.000000000 +0000
+++ cupsys-1.1.23/backend/parallel.c 2005-11-08 08:01:34.000000000 +0000
@@ -633,7 +633,7 @@
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
}
}
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
int i; /* Looping var */
int fd; /* File descriptor */
char device[255]; /* Device filename */
diff -ur cupsys-1.1.23.old/backend/serial.c cupsys-1.1.23/backend/serial.c
--- cupsys-1.1.23.old/backend/serial.c 2005-11-08 07:37:16.000000000 +0000
+++ cupsys-1.1.23/backend/serial.c 2005-11-08 08:01:34.000000000 +0000
@@ -542,10 +542,10 @@
void
list_devices(void)
{
-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
static char *funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
/* Funky hex numbering used for some devices */
-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
+#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ || __FreeBSD__kernel__ */
#if defined(__linux) || defined(linux) || defined(__linux__)
int i; /* Looping var */
@@ -792,7 +792,7 @@
printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
device, i + 1);
}
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
int i, j; /* Looping vars */
int fd; /* File descriptor */
char device[255]; /* Device filename */
diff -ur cupsys-1.1.23.old/backend/usb-unix.c cupsys-1.1.23/backend/usb-unix.c
--- cupsys-1.1.23.old/backend/usb-unix.c 2005-11-08 07:37:16.000000000 +0000
+++ cupsys-1.1.23/backend/usb-unix.c 2005-11-08 08:02:05.000000000 +0000
@@ -544,7 +544,7 @@
}
#elif defined(__hpux)
#elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
int i; /* Looping var */
char device[255]; /* Device filename */
diff -ur cupsys-1.1.23.old/backend/usb.c cupsys-1.1.23/backend/usb.c
--- cupsys-1.1.23.old/backend/usb.c 2005-11-08 07:37:16.000000000 +0000
+++ cupsys-1.1.23/backend/usb.c 2005-11-08 08:01:34.000000000 +0000
@@ -71,7 +71,7 @@
#ifdef __APPLE__
# include "usb-darwin.c"
-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
# include "usb-unix.c"
#else
/*
diff -ur cupsys-1.1.23.old/config-scripts/cups-directories.m4 cupsys-1.1.23/config-scripts/cups-directories.m4
--- cupsys-1.1.23.old/config-scripts/cups-directories.m4 2005-11-08 07:37:16.000000000 +0000
+++ cupsys-1.1.23/config-scripts/cups-directories.m4 2005-11-08 08:01:34.000000000 +0000
@@ -115,7 +115,7 @@
INITDDIR="/System/Library/StartupItems/PrintingServices"
;;
- Linux | GNU)
+ Linux | GNU | GNU/k*BSD*)
# Linux/HURD seems to choose an init.d directory at random...
if test -d /sbin/init.d; then
# SuSE
