diff options
Diffstat (limited to 'print/pips800/files')
-rw-r--r-- | print/pips800/files/ekpnavi-1.1.2.diff | 57 | ||||
-rw-r--r-- | print/pips800/files/ekpstm-1.0.2.diff | 65 | ||||
-rw-r--r-- | print/pips800/files/ekpstm-1.1.2.diff | 66 | ||||
-rw-r--r-- | print/pips800/files/extra-patch-2.6.2 | 44 | ||||
-rw-r--r-- | print/pips800/files/extra-patch-2.6.2-common | 95 | ||||
-rw-r--r-- | print/pips800/files/extra-patch-2.6.2-ekpnavi | 22 | ||||
-rw-r--r-- | print/pips800/files/extra-patch-2.6.2-ekpstm | 22 | ||||
-rw-r--r-- | print/pips800/files/extra-patch-2.6.2-lpr | 233 | ||||
-rw-r--r-- | print/pips800/files/extra-patch-2.6.2-src | 44 | ||||
-rw-r--r-- | print/pips800/files/extra-patch-2.6.2-src-cups | 67 | ||||
-rw-r--r-- | print/pips800/files/extra-patch-2.6.2-src-lpr | 54 |
11 files changed, 397 insertions, 372 deletions
diff --git a/print/pips800/files/ekpnavi-1.1.2.diff b/print/pips800/files/ekpnavi-1.1.2.diff new file mode 100644 index 000000000000..80c866ecd175 --- /dev/null +++ b/print/pips800/files/ekpnavi-1.1.2.diff @@ -0,0 +1,57 @@ +Index: src/ekpcom.c +diff -u -p src/ekpcom.c.orig src/ekpcom.c +--- src/ekpcom.c.orig Wed Jul 30 23:06:39 2003 ++++ src/ekpcom.c Tue Aug 24 23:37:45 2004 +@@ -42,15 +42,25 @@ sock_open (void) + { + int sockfd, len; + struct sockaddr_in address; ++#ifndef MSG_NOSIGNAL ++ const int on = 1; ++#endif + + if (server_sock_fd >= 0) + return 0; + + /* ソケットオープン */ + sockfd = socket (AF_INET, SOCK_STREAM, 0); ++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE) ++ setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on)); ++#endif ++ memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = htonl (INADDR_ANY); + address.sin_port = htons (35586); ++#ifdef __FreeBSD__ ++ address.sin_len = sizeof(address); ++#endif + len = sizeof (address); + if (connect (sockfd, (struct sockaddr *)&address, len)) + { +@@ -92,7 +102,11 @@ sock_write (char* buf, int* lp_wsize) + packet[4] = size % 0xFF; + memcpy (packet + Header_Size, buf, size); + ++#ifndef MSG_NOSIGNAL ++ size = send (server_sock_fd, packet, size + Header_Size, 0); ++#else + size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL); ++#endif + + if (size < 0) + return -1; +@@ -116,7 +130,11 @@ sock_read (char* buf, int* lp_rsize) + if (size <= 0) + return 0; + ++#ifndef MSG_NOSIGNAL ++ dsize = recv (server_sock_fd, packet, size, 0); ++#else + dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL); ++#endif + + if (dsize < 0) + return -1; ++ #ifdef __FreeBSD__ ++ address.sin_len = sizeof(address); ++ #endif diff --git a/print/pips800/files/ekpstm-1.0.2.diff b/print/pips800/files/ekpstm-1.0.2.diff new file mode 100644 index 000000000000..fa84bcc8440c --- /dev/null +++ b/print/pips800/files/ekpstm-1.0.2.diff @@ -0,0 +1,65 @@ +Index: src/ekpcom.c +diff -u -p src/ekpcom.c.orig src/ekpcom.c +--- src/ekpcom.c.orig Sat Oct 19 13:01:51 2002 ++++ src/ekpcom.c Wed Aug 25 18:34:15 2004 +@@ -52,14 +52,24 @@ sock_open (void) + { + int sockfd, len; + struct sockaddr_in address; ++#ifndef MSG_NOSIGNAL ++ const int on = 1; ++#endif + + if (server_sock_fd >= 0) + return 0; + + sockfd = socket (AF_INET, SOCK_STREAM, 0); ++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE) ++ setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on)); ++#endif ++ memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = htonl (INADDR_ANY); + address.sin_port = htons (35586); /* did hard coding in port number (35586) */ ++#ifdef __FreeBSD__ ++ address.sin_len = sizeof(address); ++#endif + len = sizeof (address); + if (connect (sockfd, (struct sockaddr *)&address, len)) + { +@@ -114,7 +124,11 @@ sock_write (char* buf, int* lp_wsize) + packet[4] = size % 0xFF; /* date size (lower) */ + memcpy (packet + Header_Size, buf, size); /* date */ + ++#ifndef MSG_NOSIGNAL ++ size = send (server_sock_fd, packet, size + Header_Size, 0); ++#else + size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL); ++#endif + + if (size < 0) + return -1; +@@ -144,7 +158,11 @@ sock_read (char* buf, int* lp_rsize) + if (size <= 0) + return 0; + ++#ifndef MSG_NOSIGNAL ++ dsize = recv (server_sock_fd, packet, size, 0); ++#else + dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL); ++#endif + + if (dsize < 0) + return -1; +Index: src/main.c +diff -u -p src/main.c.orig src/main.c +--- src/main.c.orig Thu Jul 31 15:01:39 2003 ++++ src/main.c Tue Aug 24 19:41:40 2004 +@@ -69,6 +69,7 @@ main (int argc, char *argv[]) + break; + + default: ++ break; + } + } + diff --git a/print/pips800/files/ekpstm-1.1.2.diff b/print/pips800/files/ekpstm-1.1.2.diff new file mode 100644 index 000000000000..ecd22fab91f3 --- /dev/null +++ b/print/pips800/files/ekpstm-1.1.2.diff @@ -0,0 +1,66 @@ +Index: src/ekpcom.c +diff -u -p src/ekpcom.c.orig src/ekpcom.c +--- src/ekpcom.c.orig Sat Oct 19 13:01:51 2002 ++++ src/ekpcom.c Wed Aug 25 18:34:15 2004 +@@ -42,15 +42,25 @@ sock_open (void) + { + int sockfd, len; + struct sockaddr_in address; ++#ifndef MSG_NOSIGNAL ++ const int on = 1; ++#endif + + if (server_sock_fd >= 0) + return 0; + + /* ソケットオープン */ + sockfd = socket (AF_INET, SOCK_STREAM, 0); ++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE) ++ setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on)); ++#endif ++ memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = htonl (INADDR_ANY); + address.sin_port = htons (35586); ++#ifdef __FreeBSD__ ++ address.sin_len = sizeof(address); ++#endif + len = sizeof (address); + if (connect (sockfd, (struct sockaddr *)&address, len)) + { +@@ -92,7 +102,11 @@ sock_write (char* buf, int* lp_wsize) + packet[4] = size % 0xFF; + memcpy (packet + Header_Size, buf, size); + ++#ifndef MSG_NOSIGNAL ++ size = send (server_sock_fd, packet, size + Header_Size, 0); ++#else + size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL); ++#endif + + if (size < 0) + return -1; +@@ -116,7 +130,11 @@ sock_read (char* buf, int* lp_rsize) + if (size <= 0) + return 0; + ++#ifndef MSG_NOSIGNAL ++ dsize = recv (server_sock_fd, packet, size, 0); ++#else + dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL); ++#endif + + if (dsize < 0) + return -1; +Index: src/main.c +diff -u -p src/main.c.orig src/main.c +--- src/main.c.orig Thu Jul 31 15:01:39 2003 ++++ src/main.c Tue Aug 24 19:41:40 2004 +@@ -69,6 +69,7 @@ main (int argc, char *argv[]) + break; + + default: ++ break; + } + } + diff --git a/print/pips800/files/extra-patch-2.6.2 b/print/pips800/files/extra-patch-2.6.2 index 23abbabb4ddb..14367fc445bc 100644 --- a/print/pips800/files/extra-patch-2.6.2 +++ b/print/pips800/files/extra-patch-2.6.2 @@ -63,47 +63,3 @@ diff -u -p ekpd/cbtd_comserv.c.orig ekpd/cbtd_comserv.c { fsync (fd); Index: src/pfpng.c -diff -u -p src/pfpng.c.orig src/pfpng.c ---- src/pfpng.c.orig Tue Jun 24 15:41:46 2003 -+++ src/pfpng.c Tue Aug 24 19:41:41 2004 -@@ -57,6 +57,8 @@ lib_png_sig_cmp *dl_png_s - void * - open_png_library (void) - { -+ if (dl_handle_libpng) -+ return (void *)dl_handle_libpng; - dl_handle_libpng = dlopen ("libpng.so", RTLD_LAZY); - if (dl_handle_libpng) - { -@@ -116,8 +118,12 @@ open_png_library (void) - void - close_png_library (void) - { -- if (dl_handle_libpng) -+#if 0 -+ if (dl_handle_libpng) { - dlclose (dl_handle_libpng); -+ dl_handle_libpng = NULL; -+ } -+#endif - - return; - } -Index: src/pipsCom.c -diff -u -p src/pipsCom.c.orig src/pipsCom.c ---- src/pipsCom.c.orig Tue Jun 24 15:41:46 2003 -+++ src/pipsCom.c Tue Aug 24 23:38:06 2004 -@@ -56,9 +56,13 @@ connect_server (char *host) - if (!servinfo) return -1; - - sockfd = socket (AF_INET, SOCK_STREAM, 0); -+ memset(&address, 0, sizeof(address)); - address.sin_family = AF_INET; - address.sin_addr = *(struct in_addr *)*hostinfo->h_addr_list; - address.sin_port = servinfo->s_port; -+#ifdef __FreeBSD__ -+ address.sin_len = sizeof(address); -+#endif - - len = sizeof (address); - if (connect (sockfd, (struct sockaddr *)&address, len) == -1) diff --git a/print/pips800/files/extra-patch-2.6.2-common b/print/pips800/files/extra-patch-2.6.2-common index 431b4982e7a3..ed1235f8071b 100644 --- a/print/pips800/files/extra-patch-2.6.2-common +++ b/print/pips800/files/extra-patch-2.6.2-common @@ -118,98 +118,3 @@ diff -u -p ekpstm/main.c.orig ekpstm/main.c } } -Index: src/Makefile.in -diff -u src/Makefile.in.orig src/Makefile.in ---- src/Makefile.in.orig Fri Oct 24 16:12:54 2003 -+++ src/Makefile.in Tue Aug 24 19:41:40 2004 -@@ -131,7 +131,7 @@ - # CUPS - AM_CFLAGS = -DGS_PATH=\"gs\" -DLOCALEDIR=\"$(datadir)/locale\" -DPRINTER_MODEL="\"$(MODEL_FULL)\"" -D$(MODEL_L) -DLIBPATH=\"$(libdir)/lib$(MODEL).so\" -DRSC_PATH=\"$(sysconfdir)/pipsrc\" -DSPOOL_NAME=\"$(MODEL)\" -DLOCALE_PATH=\"$(datadir)/locale\" -DNAVI_PATH=\"$(bindir)/ekpnavi\" -DDATA_PATH=\"$(pkgdatadir)\" -DRULED_PATH=\"$(pkgdatadir)/BID.PRN\" -DPATCH_PATH=\"$(pkgdatadir)/PATCH.PRN\" -DBAND_PATH=\"$(pkgdatadir)/BAND.PRN\" -DCUT_PATH=\"$(pkgdatadir)/CUT.PRN\" -D_LPR_DIRECT -fsigned-char -DCUPS_FILTER_PATH=\"$(cupsfilterdir)\" - --INCLUDES = @GTK_CFLAGS@ -+INCLUDES = @GTK_CFLAGS@ $(INCLTDL) - - libcutils_la_SOURCES = str.c str.h err.c err.h csv.c csv.h mem.c mem.h def.h - -@@ -146,12 +146,12 @@ - rastertopips_SOURCES = rastertopips.c - - --pipstoprinter_LDFLAGS = @LIBLTDL@ @CUPS_LIBS@ libcutils.la -+pipstoprinter_LDFLAGS = @LIBLTDL@ @CUPS_LIBS@ -lintl libcutils.la - - pipstoprinter_SOURCES = pipstoprinter.c libprtX.h debug.c debug.h ekpcom.c ekpcom.h getstat.c getstat.h - - --ekplp_LDFLAGS = @CUPS_LIBS@ libcutils.la -+ekplp_LDFLAGS = @CUPS_LIBS@ -lintl libcutils.la - - ekplp_SOURCES = ekplp.c - -Index: src/ekpcom.c -diff -u -p src/ekpcom.c.orig src/ekpcom.c ---- src/ekpcom.c.orig Wed Jul 30 22:11:04 2003 -+++ src/ekpcom.c Tue Aug 24 23:37:59 2004 -@@ -52,15 +52,25 @@ sock_open (void) - { - int sockfd, len; - struct sockaddr_in address; -+#ifndef MSG_NOSIGNAL -+ const int on = 1; -+#endif - - if (server_sock_fd >= 0) - return 0; - - /* Socket open */ - sockfd = socket (AF_INET, SOCK_STREAM, 0); -+#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE) -+ setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on)); -+#endif -+ memset(&address, 0, sizeof(address)); - address.sin_family = AF_INET; - address.sin_addr.s_addr = htonl (INADDR_ANY); - address.sin_port = htons (PORT_NUMBER); -+#ifdef __FreeBSD__ -+ address.sin_len = sizeof(address); -+#endif - len = sizeof (address); - if (connect (sockfd, (struct sockaddr *)&address, len)) - { -@@ -102,7 +112,11 @@ sock_write (char* buf, int* lp_wsize) - packet[4] = size % 0xFF; - memcpy (packet + Header_Size, buf, size); - -+#ifndef MSG_NOSIGNAL -+ size = send (server_sock_fd, packet, size + Header_Size, 0); -+#else - size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL); -+#endif - - if (size < 0) - return -1; -@@ -126,7 +140,11 @@ sock_read (char* buf, int* lp_rsize) - if (size <= 0) - return 0; - -+#ifndef MSG_NOSIGNAL -+ dsize = recv (server_sock_fd, packet, size, 0); -+#else - dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL); -+#endif - - if (dsize < 0) - return -1; -Index: src/rastertopips.c -diff -u -p src/rastertopips.c.orig src/rastertopips.c ---- src/rastertopips.c.orig Thu Sep 4 13:34:25 2003 -+++ src/rastertopips.c Tue Aug 24 19:41:41 2004 -@@ -32,6 +32,8 @@ - #include <string.h> - #include <ctype.h> - -+#define NAME_MAX 41 -+ - #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4) - - typedef struct rtp_filter_option { diff --git a/print/pips800/files/extra-patch-2.6.2-ekpnavi b/print/pips800/files/extra-patch-2.6.2-ekpnavi new file mode 100644 index 000000000000..b56069072093 --- /dev/null +++ b/print/pips800/files/extra-patch-2.6.2-ekpnavi @@ -0,0 +1,22 @@ +Index: ekpnavi/Makefile.in +diff -u ekpnavi/Makefile.in.orig ekpnavi/Makefile.in +--- ekpnavi/Makefile.in.orig Fri Dec 20 00:09:56 2002 ++++ ekpnavi/Makefile.in Wed Aug 25 18:57:41 2004 +@@ -232,7 +232,7 @@ + if test ! -s Makefile; then \ + ./configure --prefix=$(prefix) ;\ + fi ;\ +- make ++ $(MAKE) + + clean-local: + if test -d $(srcdir)/$(EKPNAVI_PKGNAME); then \ +@@ -243,7 +243,7 @@ + install-exec-local: + if test -d $(srcdir)/$(EKPNAVI_PKGNAME); then \ + cd $(srcdir)/$(EKPNAVI_PKGNAME) ;\ +- make install ;\ ++ $(MAKE) install ;\ + fi + + $(EKPNAVI_PKGNAME).tar.gz: diff --git a/print/pips800/files/extra-patch-2.6.2-ekpstm b/print/pips800/files/extra-patch-2.6.2-ekpstm new file mode 100644 index 000000000000..426685a2aee9 --- /dev/null +++ b/print/pips800/files/extra-patch-2.6.2-ekpstm @@ -0,0 +1,22 @@ +Index: ekpstm/Makefile.in +diff -u ekpstm/Makefile.in.orig ekpstm/Makefile.in +--- ekpstm/Makefile.in.orig Fri Dec 20 00:09:56 2002 ++++ ekpstm/Makefile.in Wed Aug 25 18:55:20 2004 +@@ -213,7 +213,7 @@ + ./configure --prefix=$(prefix) ;\ + fi ;\ + fi ;\ +- make ++ $(MAKE) + + clean-local: + if test -d $(srcdir)/$(EKPSTM_PKGNAME); then \ +@@ -224,7 +224,7 @@ + install-exec-local: + if test -d $(srcdir)/$(EKPSTM_PKGNAME); then \ + cd $(srcdir)/$(EKPSTM_PKGNAME) ;\ +- make install ;\ ++ $(MAKE) install ;\ + fi + + #dist-hook: diff --git a/print/pips800/files/extra-patch-2.6.2-lpr b/print/pips800/files/extra-patch-2.6.2-lpr deleted file mode 100644 index 57f9993dc55e..000000000000 --- a/print/pips800/files/extra-patch-2.6.2-lpr +++ /dev/null @@ -1,233 +0,0 @@ -Index: ekpnavi/Makefile.in -diff -u ekpnavi/Makefile.in.orig ekpnavi/Makefile.in ---- ekpnavi/Makefile.in.orig Fri Dec 20 00:09:56 2002 -+++ ekpnavi/Makefile.in Wed Aug 25 18:57:41 2004 -@@ -232,7 +232,7 @@ - if test ! -s Makefile; then \ - ./configure --prefix=$(prefix) ;\ - fi ;\ -- make -+ $(MAKE) - - clean-local: - if test -d $(srcdir)/$(EKPNAVI_PKGNAME); then \ -@@ -243,7 +243,7 @@ - install-exec-local: - if test -d $(srcdir)/$(EKPNAVI_PKGNAME); then \ - cd $(srcdir)/$(EKPNAVI_PKGNAME) ;\ -- make install ;\ -+ $(MAKE) install ;\ - fi - - $(EKPNAVI_PKGNAME).tar.gz: -Index: ekpnavi/ekpnavi-1.1.2/src/ekpcom.c -diff -u -p ekpnavi/ekpnavi-1.1.2/src/ekpcom.c.orig ekpnavi/ekpnavi-1.1.2/src/ekpcom.c ---- ekpnavi/ekpnavi-1.1.2/src/ekpcom.c.orig Wed Jul 30 23:06:39 2003 -+++ ekpnavi/ekpnavi-1.1.2/src/ekpcom.c Tue Aug 24 23:37:45 2004 -@@ -42,15 +42,25 @@ sock_open (void) - { - int sockfd, len; - struct sockaddr_in address; -+#ifndef MSG_NOSIGNAL -+ const int on = 1; -+#endif - - if (server_sock_fd >= 0) - return 0; - - /* ソケットオープン */ - sockfd = socket (AF_INET, SOCK_STREAM, 0); -+#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE) -+ setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on)); -+#endif -+ memset(&address, 0, sizeof(address)); - address.sin_family = AF_INET; - address.sin_addr.s_addr = htonl (INADDR_ANY); - address.sin_port = htons (35586); -+#ifdef __FreeBSD__ -+ address.sin_len = sizeof(address); -+#endif - len = sizeof (address); - if (connect (sockfd, (struct sockaddr *)&address, len)) - { -@@ -92,7 +102,11 @@ sock_write (char* buf, int* lp_wsize) - packet[4] = size % 0xFF; - memcpy (packet + Header_Size, buf, size); - -+#ifndef MSG_NOSIGNAL -+ size = send (server_sock_fd, packet, size + Header_Size, 0); -+#else - size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL); -+#endif - - if (size < 0) - return -1; -@@ -116,7 +130,11 @@ sock_read (char* buf, int* lp_rsize) - if (size <= 0) - return 0; - -+#ifndef MSG_NOSIGNAL -+ dsize = recv (server_sock_fd, packet, size, 0); -+#else - dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL); -+#endif - - if (dsize < 0) - return -1; -+ #ifdef __FreeBSD__ -+ address.sin_len = sizeof(address); -+ #endif -Index: ekpstm/Makefile.in -diff -u ekpstm/Makefile.in.orig ekpstm/Makefile.in ---- ekpstm/Makefile.in.orig Fri Dec 20 00:09:56 2002 -+++ ekpstm/Makefile.in Wed Aug 25 18:55:20 2004 -@@ -213,7 +213,7 @@ - ./configure --prefix=$(prefix) ;\ - fi ;\ - fi ;\ -- make -+ $(MAKE) - - clean-local: - if test -d $(srcdir)/$(EKPSTM_PKGNAME); then \ -@@ -224,7 +224,7 @@ - install-exec-local: - if test -d $(srcdir)/$(EKPSTM_PKGNAME); then \ - cd $(srcdir)/$(EKPSTM_PKGNAME) ;\ -- make install ;\ -+ $(MAKE) install ;\ - fi - - #dist-hook: -Index: ekpstm/ekpstm-1.0.2/src/ekpcom.c -diff -u -p ekpstm/ekpstm-1.0.2/src/ekpcom.c.orig ekpstm/ekpstm-1.0.2/src/ekpcom.c ---- ekpstm/ekpstm-1.0.2/src/ekpcom.c.orig Sat Oct 19 13:01:51 2002 -+++ ekpstm/ekpstm-1.0.2/src/ekpcom.c Wed Aug 25 18:34:15 2004 -@@ -52,14 +52,24 @@ sock_open (void) - { - int sockfd, len; - struct sockaddr_in address; -+#ifndef MSG_NOSIGNAL -+ const int on = 1; -+#endif - - if (server_sock_fd >= 0) - return 0; - - sockfd = socket (AF_INET, SOCK_STREAM, 0); -+#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE) -+ setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on)); -+#endif -+ memset(&address, 0, sizeof(address)); - address.sin_family = AF_INET; - address.sin_addr.s_addr = htonl (INADDR_ANY); - address.sin_port = htons (35586); /* did hard coding in port number (35586) */ -+#ifdef __FreeBSD__ -+ address.sin_len = sizeof(address); -+#endif - len = sizeof (address); - if (connect (sockfd, (struct sockaddr *)&address, len)) - { -@@ -114,7 +124,11 @@ sock_write (char* buf, int* lp_wsize) - packet[4] = size % 0xFF; /* date size (lower) */ - memcpy (packet + Header_Size, buf, size); /* date */ - -+#ifndef MSG_NOSIGNAL -+ size = send (server_sock_fd, packet, size + Header_Size, 0); -+#else - size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL); -+#endif - - if (size < 0) - return -1; -@@ -144,7 +158,11 @@ sock_read (char* buf, int* lp_rsize) - if (size <= 0) - return 0; - -+#ifndef MSG_NOSIGNAL -+ dsize = recv (server_sock_fd, packet, size, 0); -+#else - dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL); -+#endif - - if (dsize < 0) - return -1; -Index: ekpstm/ekpstm-1.0.2/src/main.c -diff -u -p ekpstm/ekpstm-1.0.2/src/main.c.orig ekpstm/ekpstm-1.0.2/src/main.c ---- ekpstm/ekpstm-1.0.2/src/main.c.orig Thu Jul 31 15:01:39 2003 -+++ ekpstm/ekpstm-1.0.2/src/main.c Tue Aug 24 19:41:40 2004 -@@ -69,6 +69,7 @@ main (int argc, char *argv[]) - break; - - default: -+ break; - } - } - -Index: src/Makefile.in -diff -u src/Makefile.in.orig src/Makefile.in ---- src/Makefile.in.orig Fri Dec 20 00:09:54 2002 -+++ src/Makefile.in Wed Aug 25 18:31:51 2004 -@@ -104,7 +104,7 @@ - MODEL_L = $(shell echo $(MODEL) | tr [:lower:] [:upper:]) - CFLAGS = -DGS_PATH=\"gs\" -DLOCALEDIR=\"$(datadir)/locale\" -DPRINTER_MODEL="\"$(MODEL_FULL)\"" -D$(MODEL_L) -DLIBPATH=\"$(libdir)/lib$(MODEL).so\" -DRSC_PATH=\"$(sysconfdir)/pipsrc\" -DSPOOL_NAME=\"$(MODEL)\" -DLOCALE_PATH=\"$(datadir)/locale\" -DNAVI_PATH=\"$(bindir)/ekpnavi\" -DDATA_PATH=\"$(pkgdatadir)\" -DRULED_PATH=\"$(pkgdatadir)/BID.PRN\" -DPATCH_PATH=\"$(pkgdatadir)/PATCH.PRN\" -DBAND_PATH=\"$(pkgdatadir)/BAND.PRN\" -DCUT_PATH=\"$(pkgdatadir)/CUT.PRN\" -D_LPR_DIRECT @CFLAGS@ -fsigned-char - --INCLUDES = @GTK_CFLAGS@ -+INCLUDES = @GTK_CFLAGS@ $(INCLTDL) - - FILTER_RESOURCE = opt$(MODEL_L).rsc - -Index: src/ekpcom.c -diff -u -p src/ekpcom.c.orig src/ekpcom.c ---- src/ekpcom.c.orig Sat Oct 19 16:56:12 2002 -+++ src/ekpcom.c Wed Aug 25 18:40:11 2004 -@@ -51,15 +51,25 @@ sock_open (void) - { - int sockfd, len; - struct sockaddr_in address; -+#ifndef MSG_NOSIGNAL -+ const int on = 1; -+#endif - - if (server_sock_fd >= 0) - return 0; - - /* ソケットオープン */ - sockfd = socket (AF_INET, SOCK_STREAM, 0); -+#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE) -+ setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on)); -+#endif -+ memset(&address, 0, sizeof(address)); - address.sin_family = AF_INET; - address.sin_addr.s_addr = htonl (INADDR_ANY); - address.sin_port = htons (35586); -+#ifdef __FreeBSD__ -+ address.sin_len = sizeof(address); -+#endif - len = sizeof (address); - if (connect (sockfd, (struct sockaddr *)&address, len)) - { -@@ -101,7 +111,11 @@ sock_write (char* buf, int* lp_wsize) - packet[4] = size % 0xFF; - memcpy (packet + Header_Size, buf, size); - -+#ifndef MSG_NOSIGNAL -+ size = send (server_sock_fd, packet, size + Header_Size, 0); -+#else - size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL); -+#endif - - if (size < 0) - return -1; -@@ -125,7 +139,11 @@ sock_read (char* buf, int* lp_rsize) - if (size <= 0) - return 0; - -+#ifndef MSG_NOSIGNAL -+ dsize = recv (server_sock_fd, packet, size, 0); -+#else - dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL); -+#endif - - if (dsize < 0) - return -1; diff --git a/print/pips800/files/extra-patch-2.6.2-src b/print/pips800/files/extra-patch-2.6.2-src new file mode 100644 index 000000000000..81ec58f9d38a --- /dev/null +++ b/print/pips800/files/extra-patch-2.6.2-src @@ -0,0 +1,44 @@ +diff -u -p src/pfpng.c.orig src/pfpng.c +--- src/pfpng.c.orig Tue Jun 24 15:41:46 2003 ++++ src/pfpng.c Tue Aug 24 19:41:41 2004 +@@ -57,6 +57,8 @@ lib_png_sig_cmp *dl_png_s + void * + open_png_library (void) + { ++ if (dl_handle_libpng) ++ return (void *)dl_handle_libpng; + dl_handle_libpng = dlopen ("libpng.so", RTLD_LAZY); + if (dl_handle_libpng) + { +@@ -116,8 +118,12 @@ open_png_library (void) + void + close_png_library (void) + { +- if (dl_handle_libpng) ++#if 0 ++ if (dl_handle_libpng) { + dlclose (dl_handle_libpng); ++ dl_handle_libpng = NULL; ++ } ++#endif + + return; + } +Index: src/pipsCom.c +diff -u -p src/pipsCom.c.orig src/pipsCom.c +--- src/pipsCom.c.orig Tue Jun 24 15:41:46 2003 ++++ src/pipsCom.c Tue Aug 24 23:38:06 2004 +@@ -56,9 +56,13 @@ connect_server (char *host) + if (!servinfo) return -1; + + sockfd = socket (AF_INET, SOCK_STREAM, 0); ++ memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr = *(struct in_addr *)*hostinfo->h_addr_list; + address.sin_port = servinfo->s_port; ++#ifdef __FreeBSD__ ++ address.sin_len = sizeof(address); ++#endif + + len = sizeof (address); + if (connect (sockfd, (struct sockaddr *)&address, len) == -1) diff --git a/print/pips800/files/extra-patch-2.6.2-src-cups b/print/pips800/files/extra-patch-2.6.2-src-cups new file mode 100644 index 000000000000..3f7ce8da1b21 --- /dev/null +++ b/print/pips800/files/extra-patch-2.6.2-src-cups @@ -0,0 +1,67 @@ +Index: src/ekpcom.c +diff -u -p src/ekpcom.c.orig src/ekpcom.c +--- src/ekpcom.c.orig Wed Jul 30 22:11:04 2003 ++++ src/ekpcom.c Tue Aug 24 23:37:59 2004 +@@ -52,15 +52,25 @@ sock_open (void) + { + int sockfd, len; + struct sockaddr_in address; ++#ifndef MSG_NOSIGNAL ++ const int on = 1; ++#endif + + if (server_sock_fd >= 0) + return 0; + + /* Socket open */ + sockfd = socket (AF_INET, SOCK_STREAM, 0); ++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE) ++ setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on)); ++#endif ++ memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = htonl (INADDR_ANY); + address.sin_port = htons (PORT_NUMBER); ++#ifdef __FreeBSD__ ++ address.sin_len = sizeof(address); ++#endif + len = sizeof (address); + if (connect (sockfd, (struct sockaddr *)&address, len)) + { +@@ -102,7 +112,11 @@ sock_write (char* buf, int* lp_wsize) + packet[4] = size % 0xFF; + memcpy (packet + Header_Size, buf, size); + ++#ifndef MSG_NOSIGNAL ++ size = send (server_sock_fd, packet, size + Header_Size, 0); ++#else + size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL); ++#endif + + if (size < 0) + return -1; +@@ -126,7 +140,11 @@ sock_read (char* buf, int* lp_rsize) + if (size <= 0) + return 0; + ++#ifndef MSG_NOSIGNAL ++ dsize = recv (server_sock_fd, packet, size, 0); ++#else + dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL); ++#endif + + if (dsize < 0) + return -1; +Index: src/rastertopips.c +diff -u -p src/rastertopips.c.orig src/rastertopips.c +--- src/rastertopips.c.orig Thu Sep 4 13:34:25 2003 ++++ src/rastertopips.c Tue Aug 24 19:41:41 2004 +@@ -32,6 +32,8 @@ + #include <string.h> + #include <ctype.h> + ++#define NAME_MAX 41 ++ + #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4) + + typedef struct rtp_filter_option { diff --git a/print/pips800/files/extra-patch-2.6.2-src-lpr b/print/pips800/files/extra-patch-2.6.2-src-lpr new file mode 100644 index 000000000000..056f7f5e0e60 --- /dev/null +++ b/print/pips800/files/extra-patch-2.6.2-src-lpr @@ -0,0 +1,54 @@ +Index: src/ekpcom.c +diff -u -p src/ekpcom.c.orig src/ekpcom.c +--- src/ekpcom.c.orig Sat Oct 19 16:56:12 2002 ++++ src/ekpcom.c Wed Aug 25 18:40:11 2004 +@@ -51,15 +51,25 @@ sock_open (void) + { + int sockfd, len; + struct sockaddr_in address; ++#ifndef MSG_NOSIGNAL ++ const int on = 1; ++#endif + + if (server_sock_fd >= 0) + return 0; + + /* ソケットオープン */ + sockfd = socket (AF_INET, SOCK_STREAM, 0); ++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE) ++ setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on)); ++#endif ++ memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = htonl (INADDR_ANY); + address.sin_port = htons (35586); ++#ifdef __FreeBSD__ ++ address.sin_len = sizeof(address); ++#endif + len = sizeof (address); + if (connect (sockfd, (struct sockaddr *)&address, len)) + { +@@ -101,7 +111,11 @@ sock_write (char* buf, int* lp_wsize) + packet[4] = size % 0xFF; + memcpy (packet + Header_Size, buf, size); + ++#ifndef MSG_NOSIGNAL ++ size = send (server_sock_fd, packet, size + Header_Size, 0); ++#else + size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL); ++#endif + + if (size < 0) + return -1; +@@ -125,7 +139,11 @@ sock_read (char* buf, int* lp_rsize) + if (size <= 0) + return 0; + ++#ifndef MSG_NOSIGNAL ++ dsize = recv (server_sock_fd, packet, size, 0); ++#else + dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL); ++#endif + + if (dsize < 0) + return -1; |