# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # openprinting # openprinting/pkg-descr # openprinting/distinfo # openprinting/Makefile # openprinting/files # openprinting/files/patch-freebsd # echo c - openprinting mkdir -p openprinting > /dev/null 2>&1 echo x - openprinting/pkg-descr sed 's/^X//' >openprinting/pkg-descr << '54e2f109e5e0f9caa93f2b207931bb3a' XThis package contains implentations of the Free Standards Group (FSG) XOpen Printing API (PAPI) (v1.0) and client software that uses it. XThe implemenations of the API are designed so that they can be used Xindividually to support client application interaction with a particular Xtype of print service or together to interact with a variety of different Xprint service types. X XWWW: http://openprinting.sourceforge.net/ X XBruce Xbms@FreeBSD.org 54e2f109e5e0f9caa93f2b207931bb3a echo x - openprinting/distinfo sed 's/^X//' >openprinting/distinfo << '0814f17c52b0f33f120d21a18b53aab1' XMD5 (openprinting/papi-1.0_beta.tar.bz2) = 7e6f769de88d581fdb78a538d97e6373 XSHA256 (openprinting/papi-1.0_beta.tar.bz2) = 235b560282ea15ac78920748ed5d1215b224e4dc9548f4d9f8bf11fb574d2b7d XSIZE (openprinting/papi-1.0_beta.tar.bz2) = 358460 0814f17c52b0f33f120d21a18b53aab1 echo x - openprinting/Makefile sed 's/^X//' >openprinting/Makefile << 'e6729c570b1aa90d0ed2e3d8b4db9239' X# New ports collection makefile for: openprinting X# Date created: 6 February 2010 X# Whom: Bruce M Simpson X# X# $FreeBSD$ X# X XPORTNAME= openprinting XPORTVERSION= 1.0 XCATEGORIES= print net XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE} XMASTER_SITE_SUBDIR=\ X openprinting/papi/1.0%20Beta XDISTNAME= papi-${PORTVERSION}_beta XDIST_SUBDIR= ${PORTNAME} X XMAINTAINER= bms@FreeBSD.org XCOMMENT= Sun's implementation of the OpenPrinting API (PAPI) X XWRKSRC= ${WRKDIR}/papi-${PORTVERSION}_beta X XUSE_BZIP2= yes XUSE_GMAKE= yes XUSE_GETTEXT= yes XUSE_ICONV= yes X XUSE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/libexec X XGNU_CONFIGURE= yes XMAKE_JOBS_SAFE= yes X XUSE_AUTOTOOLS= aclocal:19 autoconf:262 autoheader:262 automake:19 libtool:22 XACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal XAUTOMAKE_ARGS+= -a -c X X# Really disable building static libraries; the package does not use X# its own libtool, and we have to tell it to stop. X# Static libraries are not very useful in this package. XMAKE_ARGS= LIBTOOL="${LIBTOOL} --tag=disable-static" X X# TODO: Get mod_ipp to actually work; Sun's example seems to be broken X# under both Apache 1.3/2.0, this could be a papi issue; does not build X# w/Apache 2.2. X# TODO: Fix Apache module install target to instead use APXS X# from this file; it is intended only as an example. X# TODO: CUPS integration is broken in distfiles (missing papi_int.h). X#OPTIONS=\ X# MOD_IPP "Build example mod_ipp.so for Apache" Off X# PSM_CUPS "Build psm_cups.so for printing to CUPS" Off X X.include X X# NOTE: hard dependency on gettext() in distfiles. XCONFIGURE_ARGS+=\ X LDFLAGS="-L${LOCALBASE}/lib" \ X CPPFLAGS="-I${LOCALBASE}/include" \ X LIBS="-lintl" X X# NOTE: This has only been tested with www/apache20, with integrated APR. X.if defined(WITH_MOD_IPP) XUSE_APACHE= 2.0 XCONFIGURE_ARGS+=--with-apache=${LOCALBASE} X.else XCONFIGURE_ARGS+=--without-apache X.endif X X.if defined(WITH_PSM_CUPS) XLIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client XCONFIGURE_ARGS+=--with-cups=${LOCALBASE} X.else XCONFIGURE_ARGS+=--without-cups X.endif X XMANCOMPRESSED= no XMAN5= psm-ipp.5 X XPLIST_FILES+=\ X include/papi.h \ X include/ipp.h \ X include/debug.h \ X include/http.h \ X include/http-private.h \ X include/ipp-listener.h \ X lib/libpapi-common.so.0 \ X lib/libpapi-common.la \ X lib/libpapi.so.0 \ X lib/libpapi.la \ X lib/libipp-core.so.0 \ X lib/libipp-core.la \ X lib/libipp-listener.so.0 \ X lib/libipp-listener.la \ X libexec/psm-lpd.so \ X libexec/psm-lpd.la \ X libexec/psm-ipp.so \ X libexec/psm-ipp.la \ X libexec/lpd-port X X.if defined(WITH_PSM_CUPS) XPLIST_FILES+=\ X libexec/psm-cups.so \ X libexec/psm-cups.la X.endif X X.if defined(WITH_MOD_IPP) XPLIST_FILES+=\ X lib/mod_ipp.so \ X lib/mod_ipp.la X.endif X X.include X Xpre-configure: X cd ${WRKSRC}; ./autogen.sh X X.include e6729c570b1aa90d0ed2e3d8b4db9239 echo c - openprinting/files mkdir -p openprinting/files > /dev/null 2>&1 echo x - openprinting/files/patch-freebsd sed 's/^X//' >openprinting/files/patch-freebsd << '6a4d8fae3d789a6652dc228dca1a8859' XFiles /home/bms/x/y/papi-1.0_beta.orig/.acinclude.m4.swp and ./.acinclude.m4.swp differ Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/acinclude.m4 ./acinclude.m4 X--- /home/bms/x/y/papi-1.0_beta.orig/acinclude.m4 2005-09-21 17:59:13.000000000 +0100 X+++ ./acinclude.m4 2010-02-06 20:06:09.000000000 +0000 X@@ -41,3 +41,19 @@ X fi X AM_CONDITIONAL(HAVE_CUPS, [ test x$CUPS_PREFIX != x ]) X ]) X+ X+dnl X+dnl Check if we should build examples. X+dnl X+AC_DEFUN([AC_CHECK_EXAMPLES], [ X+AC_ARG_ENABLE(examples, [ --enable-examples build with examples [default=no]], enable_examples=yes, enable_examples=no) X+AM_CONDITIONAL(ENABLE_EXAMPLES, [ test x$enable_examples != xno ]) X+]) X+ X+dnl X+dnl Check if we should BSD/SYSV lpr commands. X+dnl X+AC_DEFUN([AC_CHECK_BSD_SYSV_COMMANDS], [ X+AC_ARG_ENABLE(bsd-sysv-commands, [ --enable-bsd-sysv-commands build with BSD/SYSV commands [default=no]], enable_bsd_sysv_commands=yes, enable_bsd_sysv_commands=no) X+AM_CONDITIONAL(ENABLE_BSD_SYSV_COMMANDS, [ test x$enable_bsd_sysv_commands != xno ]) X+]) Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/configure.in ./configure.in X--- /home/bms/x/y/papi-1.0_beta.orig/configure.in 2006-03-12 06:15:33.000000000 +0000 X+++ ./configure.in 2010-02-06 20:05:07.000000000 +0000 X@@ -115,6 +115,12 @@ X AC_MSG_RESULT([Default IPP server: $DEFAULT_IPP_SERVER]) X AC_SUBST(DEFAULT_IPP_SERVER) X X+dnl»····check if we should build and install examples. X+AC_CHECK_EXAMPLES X+ X+dnl»····check if we should build and install BSD/SYSV lpr commands. X+AC_CHECK_BSD_SYSV_COMMANDS X+ X dnl which linker flags do we use for inclusion of mapfiles. X os=`uname -s` X AM_CONDITIONAL(LINUX, [ test x$os = xLinux ] ) Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/docs/man/Makefile.am ./docs/man/Makefile.am X--- /home/bms/x/y/papi-1.0_beta.orig/docs/man/Makefile.am 2006-03-12 06:30:42.000000000 +0000 X+++ ./docs/man/Makefile.am 2010-02-06 20:18:41.000000000 +0000 X@@ -5,16 +5,21 @@ X # $Id: Makefile.am,v 1.5 2006/03/12 06:30:42 njacobs Exp $ X # X X-man_MANS_in = lpq.1b.in lpr.1b.in lprm.1b.in lpc.1b.in X+man_MANS_in = X+if ENABLE_BSD_SYSV_COMMANDS X+man_MANS_in += lpq.1b.in lpr.1b.in lprm.1b.in lpc.1b.in X man_MANS_in += lpstat.1.in lp.1.in cancel.1.in enable.1.in disable.1.in X man_MANS_in += lpmove.1m.in accept.1m.in reject.1m.in X+endif X man_MANS_in += psm-ipp.5.in X X X man_MANS=$(man_MANS_in:%.in=%) X+if ENABLE_BSD_SYSV_COMMANDS X man_MANS += lpq.1b lpr.1b lprm.1b lpc.1b X man_MANS += lpstat.1 lp.1 cancel.1 enable.1 disable.1 X man_MANS += lpmove.1m accept.1m reject.1m X+endif X man_MANS += psm-ipp.5 X X SUFFIXES = .in Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/Makefile.am ./source/Makefile.am X--- /home/bms/x/y/papi-1.0_beta.orig/source/Makefile.am 2005-09-21 18:13:17.000000000 +0100 X+++ ./source/Makefile.am 2010-02-06 20:05:59.000000000 +0000 X@@ -13,6 +13,14 @@ X CUPS_MODULE= libpapi-cups X endif X X+if ENABLE_EXAMPLES X+EXAMPLES= examples X+endif X+ X+if ENABLE_BSD_SYSV_COMMANDS X+BSD_SYSV_COMMANDS= bsd-sysv-commands X+endif X+ X AUTOMAKE_OPTIONS=foreign X SUBDIRS= libpapi-common \ X libpapi-dynamic \ X@@ -21,6 +29,6 @@ X libpapi-ipp \ X $(CUPS_MODULE) \ X libipp-listener \ X- bsd-sysv-commands \ X+ $(BSD_SYSV_COMANDS) \ X $(APACHE_MODULE) \ X- examples X+ $(EXAMPLES) Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/bsd-sysv-commands/common.c ./source/bsd-sysv-commands/common.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/bsd-sysv-commands/common.c 2006-02-15 21:24:20.000000000 +0000 X+++ ./source/bsd-sysv-commands/common.c 2010-01-31 13:40:22.000000000 +0000 X@@ -8,7 +8,9 @@ X #include X #include X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #include X #include X #include Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/bsd-sysv-commands/in.lpd.c ./source/bsd-sysv-commands/in.lpd.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/bsd-sysv-commands/in.lpd.c 2006-01-28 07:02:04.000000000 +0000 X+++ ./source/bsd-sysv-commands/in.lpd.c 2010-01-31 13:58:00.000000000 +0000 X@@ -6,6 +6,7 @@ X #pragma ident "$Id: in.lpd.c,v 1.3 2006/01/28 07:02:04 njacobs Exp $" X X #include X+#include X #include X #include X #include Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/bsd-sysv-commands/lp.c ./source/bsd-sysv-commands/lp.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/bsd-sysv-commands/lp.c 2006-02-25 01:08:06.000000000 +0000 X+++ ./source/bsd-sysv-commands/lp.c 2010-01-31 13:57:30.000000000 +0000 X@@ -223,7 +223,7 @@ X printer = DEFAULT_DEST; X X if (modify == -1) { X- char *document_format = "application/octet-stream"; X+ const char *document_format = "application/octet-stream"; X X #ifdef MAGIC_MIME X if (optind != ac) { X@@ -238,6 +238,7 @@ X #endif X X papiAttributeListAddInteger(&list, PAPI_ATTR_EXCL, "copies", 1); X+ /* XXX CONST arg */ X papiAttributeListAddString(&list, PAPI_ATTR_EXCL, X "document-format", document_format); X papiAttributeListAddString(&list, PAPI_ATTR_EXCL, Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/bsd-sysv-commands/lpr.c ./source/bsd-sysv-commands/lpr.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/bsd-sysv-commands/lpr.c 2006-02-01 23:52:42.000000000 +0000 X+++ ./source/bsd-sysv-commands/lpr.c 2010-01-31 13:57:05.000000000 +0000 X@@ -51,7 +51,7 @@ X int validate = 0; X int remove = 0; X int copy = 1; /* default is to copy the data */ X- char *document_format = "application/octet-stream"; X+ const char *document_format = "application/octet-stream"; X int c; X X (void) setlocale(LC_ALL, ""); X@@ -196,6 +196,7 @@ X #endif X X papiAttributeListAddInteger(&list, PAPI_ATTR_EXCL, "copies", 1); X+ /* XXX CONST arg */ X papiAttributeListAddString(&list, PAPI_ATTR_EXCL, X "document-format", document_format); X papiAttributeListAddString(&list, PAPI_ATTR_EXCL, Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/examples/printer-query.c ./source/examples/printer-query.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/examples/printer-query.c 2005-10-31 18:53:11.000000000 +0000 X+++ ./source/examples/printer-query.c 2010-01-31 13:50:47.000000000 +0000 X@@ -16,7 +16,9 @@ X #include X #include X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #include X X static void Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libipp-core/ipp_types.c ./source/libipp-core/ipp_types.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libipp-core/ipp_types.c 2005-02-26 06:58:41.000000000 +0000 X+++ ./source/libipp-core/ipp_types.c 2010-01-31 13:19:34.000000000 +0000 X@@ -11,7 +11,14 @@ X #include X #include X #include X+#ifdef HAVE_VALUES_H X #include X+#endif X+#include X+ X+#ifndef MAXINT X+#define MAXINT INT_MAX X+#endif X X #ifndef MININT X #define MININT (-MAXINT - 1) Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libipp-core/read.c ./source/libipp-core/read.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libipp-core/read.c 2006-01-28 07:02:04.000000000 +0000 X+++ ./source/libipp-core/read.c 2010-01-31 13:20:03.000000000 +0000 X@@ -7,7 +7,9 @@ X X #include X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #include X #include X #include Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libipp-listener/common.c ./source/libipp-listener/common.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libipp-listener/common.c 2006-02-26 07:40:38.000000000 +0000 X+++ ./source/libipp-listener/common.c 2010-01-31 13:55:43.000000000 +0000 X@@ -74,7 +74,7 @@ X } else { X *printer = job; X if ((job = strrchr(*printer, '/')) != NULL) { X- *job = NULL; X+ *job = '\0'; X *id = atoi(++job); X } X } X@@ -230,7 +230,7 @@ X X name = strtok(buf, " \t\n"); X X- for (i = 0; ((passed == 1) && (name[i] != NULL)); i++) X+ for (i = 0; ((passed == 1) && (name[i] != '\0')); i++) X if (isalpha(name[i]) != 0) X name[i] = tolower(name[i]); X else if ((name[i] == '_') || (name[i] == '-')) Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/attribute.c ./source/libpapi-common/attribute.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/attribute.c 2006-02-25 06:06:36.000000000 +0000 X+++ ./source/libpapi-common/attribute.c 2010-01-31 13:10:28.000000000 +0000 X@@ -11,7 +11,9 @@ X #include X #include X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #include X X static void papiAttributeFree(papi_attribute_t *attribute); Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/config.h.in ./source/libpapi-common/config.h.in X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/config.h.in 2006-03-12 06:17:13.000000000 +0000 X+++ ./source/libpapi-common/config.h.in 2010-02-06 20:05:40.000000000 +0000 X@@ -84,6 +84,10 @@ X /* Define to 1 if you have the header file. */ X #undef HAVE_UNISTD_H X X+/* Define to the sub-directory in which libtool stores uninstalled libraries. X+ */ X+#undef LT_OBJDIR X+ X /* Name of package */ X #undef PACKAGE X Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/config.h.in~ ./source/libpapi-common/config.h.in~ X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/config.h.in~ 1970-01-01 01:00:00.000000000 +0100 X+++ ./source/libpapi-common/config.h.in~ 2010-02-06 20:05:12.000000000 +0000 X@@ -0,0 +1,103 @@ X+/* source/libpapi-common/config.h.in. Generated from configure.in by autoheader. */ X+ X+/* Define to 1 if you have the `dlopen' function. */ X+#undef HAVE_DLOPEN X+ X+/* Define to 1 if you have the `dlsym' function. */ X+#undef HAVE_DLSYM X+ X+/* Define to 1 if you have the `fprintf' function. */ X+#undef HAVE_FPRINTF X+ X+/* define if you have getipnodbyname */ X+#undef HAVE_GETIPNODEBYNAME X+ X+/* Define to 1 if you have the `getpassphrase' function. */ X+#undef HAVE_GETPASSPHRASE X+ X+/* Define to 1 if you have the `gettext' function. */ X+#undef HAVE_GETTEXT X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_INTTYPES_H X+ X+/* Define to 1 if you have the `is_system_labeled' function. */ X+#undef HAVE_IS_SYSTEM_LABELED X+ X+/* Define to 1 if you have the `localtime' function. */ X+#undef HAVE_LOCALTIME X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_MEMORY_H X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_PRIV_H X+ X+/* define if you have rresvport_af */ X+#undef HAVE_RRESVPORT_AF X+ X+/* Define to 1 if you have the `snprintf' function. */ X+#undef HAVE_SNPRINTF X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_STDARG_H X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_STDINT_H X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_STDLIB_H X+ X+/* Define to 1 if you have the `strcmp' function. */ X+#undef HAVE_STRCMP X+ X+/* Define to 1 if you have the `strdup' function. */ X+#undef HAVE_STRDUP X+ X+/* Define to 1 if you have the `strerror' function. */ X+#undef HAVE_STRERROR X+ X+/* Define to 1 if you have the `strftime' function. */ X+#undef HAVE_STRFTIME X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_STRINGS_H X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_STRING_H X+ X+/* Define to 1 if you have the `strlcat' function. */ X+#undef HAVE_STRLCAT X+ X+/* Define to 1 if you have the `strlcpy' function. */ X+#undef HAVE_STRLCPY X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_SYS_STAT_H X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_SYS_TYPES_H X+ X+/* Define to 1 if you have the header file. */ X+#undef HAVE_UNISTD_H X+ X+/* Define to the address where bug reports for this package should be sent. */ X+#undef PACKAGE_BUGREPORT X+ X+/* Define to the full name of this package. */ X+#undef PACKAGE_NAME X+ X+/* Define to the full name and version of this package. */ X+#undef PACKAGE_STRING X+ X+/* Define to the one symbol short name of this package. */ X+#undef PACKAGE_TARNAME X+ X+/* Define to the version of this package. */ X+#undef PACKAGE_VERSION X+ X+/* Define to 1 if you have the ANSI C header files. */ X+#undef STDC_HEADERS X+ X+/* Define to empty if `const' does not conform to ANSI C. */ X+#undef const Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/library.c ./source/libpapi-common/library.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/library.c 2005-10-31 18:56:45.000000000 +0000 X+++ ./source/libpapi-common/library.c 2010-01-31 13:10:49.000000000 +0000 X@@ -11,7 +11,9 @@ X #include X #include X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #include X #include X Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/uri.c ./source/libpapi-common/uri.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-common/uri.c 2005-09-21 20:04:53.000000000 +0100 X+++ ./source/libpapi-common/uri.c 2010-01-31 13:08:57.000000000 +0000 X@@ -16,7 +16,7 @@ X #include "uri.h" X X static char * X-strndup(char *string, size_t length) X+xstrndup(char *string, size_t length) X { X char *result = NULL; X X@@ -57,7 +57,7 @@ X if ((*uri = u = calloc(1, sizeof (*u))) == NULL) X return (-1); X X- u->scheme = strndup(string, ptr - string); X+ u->scheme = xstrndup(string, ptr - string); X X if ((ptr[1] == '/') && (ptr[2] == '/')) { X /* X@@ -71,14 +71,14 @@ X if ((path = end = strchr(string, '/')) == NULL) X for (end = string; *end != '\0'; end++); X X- u->host_part = strndup(string, end - string); X+ u->host_part = xstrndup(string, end - string); X X for (host = string; host < end; host ++) X if (*host == '@') { X /* string to host is the user part */ X- u->user_part = strndup(string, host-string); X+ u->user_part = xstrndup(string, host-string); X /* host+1 to end is the host part */ X- u->host_part = strndup(host + 1, X+ u->host_part = xstrndup(host + 1, X end - (host+1)); X user = string; X host++; X@@ -90,11 +90,11 @@ X X for (password = user; (password < host - 1); password++) X if (*password == ':') { X- u->password = strndup(password + 1, X+ u->password = xstrndup(password + 1, X host - password - 2); X break; X } X- u->user = strndup(user, password - user); X+ u->user = xstrndup(user, password - user); X } else X host = string; X X@@ -106,10 +106,10 @@ X break; X X if (port < path) { X- u->port = strndup(port + 1, path - port - 1); X+ u->port = xstrndup(port + 1, path - port - 1); X } X X- u->host = strndup(host, port - host); X+ u->host = xstrndup(host, port - host); X } X X if (path != NULL) { X@@ -129,12 +129,12 @@ X X fragment = strrchr(name, '#'); X if ((fragment != NULL) && (*fragment != '\0')) { X- u->fragment = strndup(fragment + 1, X+ u->fragment = xstrndup(fragment + 1, X end - fragment - 1); X end = fragment; X } X X- u->path = strndup(path, end - path); X+ u->path = xstrndup(path, end - path); X } X } X } else { /* scheme:scheme_part */ Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-cups/Makefile.am ./source/libpapi-cups/Makefile.am X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-cups/Makefile.am 2005-10-31 18:56:45.000000000 +0000 X+++ ./source/libpapi-cups/Makefile.am 2010-02-06 19:22:15.000000000 +0000 X@@ -8,7 +8,7 @@ X X lib_LTLIBRARIES = psm-cups.la X X-psm_cups_la_LIBADD = -ldl -L@CUPS_PREFIX@/lib -lcups X+psm_cups_la_LIBADD = -L@CUPS_PREFIX@/lib -lcups X psm_cups_la_LDFLAGS = -module -avoid-version X X psm_cupsincludedir = $(includedir) Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-dynamic/Makefile.am ./source/libpapi-dynamic/Makefile.am X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-dynamic/Makefile.am 2006-03-12 06:15:09.000000000 +0000 X+++ ./source/libpapi-dynamic/Makefile.am 2010-02-06 19:22:30.000000000 +0000 X@@ -8,7 +8,7 @@ X X lib_LTLIBRARIES = libpapi.la X X-libpapi_la_LIBADD = ../libpapi-common/libpapi-common.la -ldl X+libpapi_la_LIBADD = ../libpapi-common/libpapi-common.la X libpapi_la_LDFLAGS = @MAPFLAGS@ X X libpapiincludedir = $(includedir) X@@ -23,7 +23,6 @@ X libpapi_la_SOURCES += nss/nss-emulation.c nss/nss-files.c nss/nss-printcap.c \ X nss/nss-nis.c X AM_CPPFLAGS += -I./nss -DNSS_EMULATION X-libpapi_la_LIBADD += -lnsl X libpapi_la_LDFLAGS += @MAPFLAGS@-emulation X endif X Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-dynamic/nss/nss-emulation.h ./source/libpapi-dynamic/nss/nss-emulation.h X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-dynamic/nss/nss-emulation.h 2005-02-26 06:58:42.000000000 +0000 X+++ ./source/libpapi-dynamic/nss/nss-emulation.h 2010-01-31 13:14:18.000000000 +0000 X@@ -18,6 +18,10 @@ X NSS_RETURN X } nss_status_t; X X+/* FreeBSD doesn't define YPERR_SUCCESS */ X+#ifndef YPERR_SUCCESS X+#define YPERR_SUCCESS 0 X+#endif /* YPERR_SUCCESS */ X X /* Convert YP error number to NSS error number. */ X static nss_status_t yperr2nss_tab[] = Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-dynamic/psm.c ./source/libpapi-dynamic/psm.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-dynamic/psm.c 2006-02-23 19:35:34.000000000 +0000 X+++ ./source/libpapi-dynamic/psm.c 2010-01-31 13:52:45.000000000 +0000 X@@ -60,7 +60,7 @@ X void * X psm_sym(service_t *svc, char *name) X { X- char *error = "invalid input"; X+ const char *error = "invalid input"; X void *func = NULL; X X if ((svc != NULL) && (svc->so_handle != NULL) && (name != NULL)) { Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-dynamic/service.c ./source/libpapi-dynamic/service.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-dynamic/service.c 2006-02-23 19:35:34.000000000 +0000 X+++ ./source/libpapi-dynamic/service.c 2010-01-31 13:11:35.000000000 +0000 X@@ -11,7 +11,9 @@ X #include X #include X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #include X #include X Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-ipp/http-core/md5passwd.c ./source/libpapi-ipp/http-core/md5passwd.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-ipp/http-core/md5passwd.c 2005-08-29 06:07:20.000000000 +0100 X+++ ./source/libpapi-ipp/http-core/md5passwd.c 2010-01-31 13:54:46.000000000 +0000 X@@ -35,6 +35,8 @@ X * Include necessary headers... X */ X X+#include X+ X #include "http.h" X #include "string.h" X Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-ipp/service.c ./source/libpapi-ipp/service.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-ipp/service.c 2006-01-28 07:02:05.000000000 +0000 X+++ ./source/libpapi-ipp/service.c 2010-01-31 13:39:58.000000000 +0000 X@@ -11,7 +11,9 @@ X #include X #include X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #include X #include X Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/job.c ./source/libpapi-lpd/job.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/job.c 2005-10-31 18:56:45.000000000 +0000 X+++ ./source/libpapi-lpd/job.c 2010-01-31 13:31:14.000000000 +0000 X@@ -7,7 +7,7 @@ X X #include X #include X-#include X+#include X #include X #include X #include Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/library.c ./source/libpapi-lpd/library.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/library.c 2005-10-31 18:56:45.000000000 +0000 X+++ ./source/libpapi-lpd/library.c 2010-01-31 13:24:20.000000000 +0000 X@@ -9,7 +9,9 @@ X #include X #include X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #include X #include X Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-cancel.c ./source/libpapi-lpd/lpd-cancel.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-cancel.c 2005-02-26 06:58:42.000000000 +0000 X+++ ./source/libpapi-lpd/lpd-cancel.c 2010-01-31 13:32:34.000000000 +0000 X@@ -32,7 +32,7 @@ X X memset(buf, 0, sizeof (buf)); X if (fdgets(buf, sizeof (buf), fd) != NULL) { X- if (buf[0] == NULL) X+ if (buf[0] == '\0') X status = PAPI_NOT_FOUND; X else if (strstr(buf, "permission denied") != NULL) X status = PAPI_NOT_AUTHORIZED; Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-job.c ./source/libpapi-lpd/lpd-job.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-job.c 2005-02-26 06:58:42.000000000 +0000 X+++ ./source/libpapi-lpd/lpd-job.c 2010-01-31 13:31:51.000000000 +0000 X@@ -14,7 +14,7 @@ X #include X #include X #include X-#include X+#include X #include X #include X #include Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-misc.c ./source/libpapi-lpd/lpd-misc.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-misc.c 2005-09-21 20:22:10.000000000 +0100 X+++ ./source/libpapi-lpd/lpd-misc.c 2010-01-31 13:34:16.000000000 +0000 X@@ -16,8 +16,15 @@ X #include X #include X #include X+#ifdef HAVE_WAIT_H X #include X+#endif X+/*#ifdef HAVE_SYS_WAIT_H*/ X+#include X+/*#endif*/ X+#ifdef HAVE_STROPTS_H X #include X+#endif X #include X X #include X@@ -28,7 +35,7 @@ X char tmp; X int count = 0; X X- memset(buf, NULL, len); X+ memset(buf, 0, len); X while ((count < len) && (read(fd, &tmp, 1) > 0)) X if ((buf[count++] = tmp) == '\n') break; X Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-port.c ./source/libpapi-lpd/lpd-port.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-port.c 2005-09-21 20:22:22.000000000 +0100 X+++ ./source/libpapi-lpd/lpd-port.c 2010-01-31 13:29:02.000000000 +0000 X@@ -22,22 +22,35 @@ X #include X #include X #include X+#ifdef HAVE_VALUES_H X #include X+#endif X+#ifdef HAVE_STROPTS_H X #include /* for sendfd */ X+#endif X #include /* for sendmsg stuff */ X #include X+#ifdef HAVE_SYS_SENDFILE_H X #include X+#endif X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #ifdef HAVE_PRIV_H X #include X #endif X #include X+#include X X #ifndef JOB_ID_FILE X #define JOB_ID_FILE "/var/run/rfc-1179.seq" X #endif /* JOB_ID_FILE */ X X+#ifndef MAXINT X+#define MAXINT INT_MAX X+#endif X+ X static int X sendfd(int sockfd, int fd) X { X@@ -109,7 +122,7 @@ X } X X /* linux style NULL usage */ X- (void) memset((char *)&sin, (int)NULL, sizeof (sin)); X+ (void) memset((char *)&sin, (int)0, sizeof (sin)); X X #if defined(HAVE_GETIPNODEBYNAME) && defined(HAVE_RRESVPORT_AF) X if ((hp = getipnodebyname(uri->host, AF_INET6, AI_DEFAULT, X@@ -381,8 +394,14 @@ X X if (fd != -1) { X /* write the data */ X+#ifdef __FreeBSD__ X+ if (sendfile(sock, fd, off, st.st_size, NULL, NULL, 0) != X+ st.st_size) X+ return (-1); X+#else X if (sendfile(sock, fd, &off, st.st_size) != st.st_size) X return (-1); X+#endif X close(fd); X X /* request ack/nack after the data transfer */ X@@ -502,7 +521,7 @@ X errno = err; X return (-1); X } X- if (strcmp(name, "standard input") != NULL) X+ if (strcmp(name, "standard input") != 0) X sent_files++; X } X Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-query.c ./source/libpapi-lpd/lpd-query.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/lpd-query.c 2005-10-01 06:49:10.000000000 +0100 X+++ ./source/libpapi-lpd/lpd-query.c 2010-01-31 13:33:04.000000000 +0000 X@@ -82,7 +82,7 @@ X do { q--; } while (isdigit(*q) != 0); X X /* seperate the name and size */ X- *q = NULL; X+ *q = '\0'; X q++; X X size = atoi(q); Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/service.c ./source/libpapi-lpd/service.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/libpapi-lpd/service.c 2005-10-31 18:56:45.000000000 +0000 X+++ ./source/libpapi-lpd/service.c 2010-01-31 13:21:20.000000000 +0000 X@@ -9,7 +9,9 @@ X #include X #include X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X #include X #include X XFiles /home/bms/x/y/papi-1.0_beta.orig/source/mod_ipp/.mod_ipp.c.swp and ./source/mod_ipp/.mod_ipp.c.swp differ Xdiff -uNr /home/bms/x/y/papi-1.0_beta.orig/source/mod_ipp/mod_ipp.c ./source/mod_ipp/mod_ipp.c X--- /home/bms/x/y/papi-1.0_beta.orig/source/mod_ipp/mod_ipp.c 2006-02-14 06:36:49.000000000 +0000 X+++ ./source/mod_ipp/mod_ipp.c 2010-01-31 13:49:30.000000000 +0000 X@@ -14,9 +14,13 @@ X #include X #include X #include X+#ifdef HAVE_VALUES_H X #include X+#endif X #include X+#ifdef HAVE_ALLOCA_H X #include X+#endif X X #include "httpd.h" X #include "http_config.h" X@@ -170,7 +174,7 @@ X va_end(args); X X #ifdef APACHE2 X- ap_log_rerror(file, line, level, NULL, r, message); X+ ap_log_rerror(file, line, level, 0, r, message); X #else X ap_log_rerror(file, line, level, r, message); X #endif X@@ -264,6 +268,7 @@ X config->default_svc); X } X X+#if defined(sun) X /* X * For Trusted Solaris, pass the fd number of the socket connection X * to the backend so the it can be forwarded to the backend print X@@ -272,6 +277,7 @@ X */ X (void) papiAttributeListAddInteger(&request, PAPI_ATTR_EXCL, X "peer-socket", ap_bfileno(r->connection->client, B_RD)); X+#endif X X /* process the request */ X status = ipp_process_request(request, &response, read_data, r); 6a4d8fae3d789a6652dc228dca1a8859 exit