January 2012 - CRUX - lists.crux.nu

ports/opt (2.7): [notify] libxml2: apply several security fixes
by crux＠crux.nu 31 Jan '12

31 Jan '12

commit ee2b265f81f6ca45b5bfce8669c90173d9a03c63 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 31 12:31:34 2012 +0100 [notify] libxml2: apply several security fixes Fix for CVE-2010-4494, CVE-2011-{0216,2821,2834,3905,3919} diff --git a/libxml2/.md5sum b/libxml2/.md5sum index 4e904ff..a8c0688 100644 --- a/libxml2/.md5sum +++ b/libxml2/.md5sum @@ -1 +1,7 @@ +49eb3b20965fccbd251e890a6c60cb6c CVE-2010-4494.patch +a91e5ef10dcd5cf335f9d2c2ef48c712 CVE-2011-0216.patch +9027cbb76b112629cb5fa84ffcfc44bd CVE-2011-2821.patch +8bf2bd2422b9aab015fb7a8ca993eef3 CVE-2011-2834.patch +52a0f492014971c0733dfef3300725b5 CVE-2011-3905.patch +de02f584b928d3e25babc5c90aa800be CVE-2011-3919.patch 8127a65e8c3b08856093099b52599c86 libxml2-2.7.8.tar.gz diff --git a/libxml2/CVE-2010-4494.patch b/libxml2/CVE-2010-4494.patch new file mode 100644 index 0000000..fafd41f --- /dev/null +++ b/libxml2/CVE-2010-4494.patch @@ -0,0 +1,62 @@ +From df83c17e5a2646bd923f75e5e507bc80d73c9722 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard(a)redhat.com> +Date: Wed, 17 Nov 2010 13:12:14 +0000 +Subject: Fix a potential freeing error in XPath + +--- +diff --git a/xpath.c b/xpath.c +index 81e33f6..1447be5 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { + xmlXPathObjectPtr tmp; +- /* pop the result */ ++ /* pop the result if any */ + tmp = valuePop(ctxt); +- xmlXPathReleaseObject(xpctxt, tmp); +- /* then pop off contextObj, which will be freed later */ +- valuePop(ctxt); ++ if (tmp != contextObj) ++ /* ++ * Free up the result ++ * then pop off contextObj, which will be freed later ++ */ ++ xmlXPathReleaseObject(xpctxt, tmp); ++ valuePop(ctxt); + goto evaluation_error; + } + +-- +cgit v0.9.0.2 + + +From fec31bcd452e77c10579467ca87a785b41115de6 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard(a)redhat.com> +Date: Thu, 18 Nov 2010 10:07:24 +0000 +Subject: Small fix for previous commit + +--- +diff --git a/xpath.c b/xpath.c +index 1447be5..8b56189 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11765,13 +11765,14 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr tmp; + /* pop the result if any */ + tmp = valuePop(ctxt); +- if (tmp != contextObj) ++ if (tmp != contextObj) { + /* + * Free up the result + * then pop off contextObj, which will be freed later + */ + xmlXPathReleaseObject(xpctxt, tmp); + valuePop(ctxt); ++ } + goto evaluation_error; + } + +-- +cgit v0.9.0.2 diff --git a/libxml2/CVE-2011-0216.patch b/libxml2/CVE-2011-0216.patch new file mode 100644 index 0000000..e349992 --- /dev/null +++ b/libxml2/CVE-2011-0216.patch @@ -0,0 +1,32 @@ +From 69f04562f75212bfcabecd190ea8b06ace28ece2 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard(a)redhat.com> +Date: Fri, 19 Aug 2011 03:05:04 +0000 +Subject: Fix an off by one error in encoding + +this off by one error doesn't seems to reproduce on linux +but the error is real. +--- +diff --git a/encoding.c b/encoding.c +index d1140bf..fb0c38a 100644 +--- a/encoding.c ++++ b/encoding.c +@@ -1928,7 +1928,7 @@ xmlCharEncFirstLineInt(xmlCharEncodingHandler *handler, xmlBufferPtr out, + if (in == NULL) return(-1); + + /* calculate space available */ +- written = out->size - out->use; ++ written = out->size - out->use - 1; /* count '\0' */ + toconv = in->use; + /* + * echo '<?xml version="1.0" encoding="UCS4"?>' | wc -c => 38 +@@ -2059,7 +2059,7 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler, xmlBufferPtr out, + toconv = in->use; + if (toconv == 0) + return (0); +- written = out->size - out->use; ++ written = out->size - out->use -1; /* count '\0' */ + if (toconv * 2 >= written) { + xmlBufferGrow(out, out->size + toconv * 2); + written = out->size - out->use - 1; +-- +cgit v0.9.0.2 diff --git a/libxml2/CVE-2011-2821.patch b/libxml2/CVE-2011-2821.patch new file mode 100644 index 0000000..8e699ec --- /dev/null +++ b/libxml2/CVE-2011-2821.patch @@ -0,0 +1,224 @@ +From f5048b3e71fc30ad096970b8df6e7af073bae4cb Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard(a)redhat.com> +Date: Thu, 18 Aug 2011 09:10:13 +0000 +Subject: Hardening of XPath evaluation + +Add a mechanism of frame for XPath evaluation when entering a function +or a scoped evaluation, also fix a potential problem in predicate +evaluation. +--- +diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h +index 1a9e30e..ddd9dd8 100644 +--- a/include/libxml/xpath.h ++++ b/include/libxml/xpath.h +@@ -68,7 +68,8 @@ typedef enum { + XPATH_UNDEF_PREFIX_ERROR, + XPATH_ENCODING_ERROR, + XPATH_INVALID_CHAR_ERROR, +- XPATH_INVALID_CTXT ++ XPATH_INVALID_CTXT, ++ XPATH_STACK_ERROR + } xmlXPathError; + + /* +@@ -380,6 +381,8 @@ struct _xmlXPathParserContext { + xmlXPathCompExprPtr comp; /* the precompiled expression */ + int xptr; /* it this an XPointer expression */ + xmlNodePtr ancestor; /* used for walking preceding axis */ ++ ++ int valueFrame; /* used to limit Pop on the stack */ + }; + + /************************************************************************ +diff --git a/xpath.c b/xpath.c +index b59ac5a..bcee2ea 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = { + "Encoding error\n", + "Char out of XML range\n", + "Invalid or incomplete context\n", ++ "Stack usage errror\n", + "?? Unknown error ??\n" /* Must be last in the list! */ + }; + #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \ +@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) { + ************************************************************************/ + + /** ++ * xmlXPathSetFrame: ++ * @ctxt: an XPath parser context ++ * ++ * Set the callee evaluation frame ++ * ++ * Returns the previous frame value to be restored once done ++ */ ++static int ++xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { ++ int ret; ++ ++ if (ctxt == NULL) ++ return(0); ++ ret = ctxt->valueFrame; ++ ctxt->valueFrame = ctxt->valueNr; ++ return(ret); ++} ++ ++/** ++ * xmlXPathPopFrame: ++ * @ctxt: an XPath parser context ++ * @frame: the previous frame value ++ * ++ * Remove the callee evaluation frame ++ */ ++static void ++xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { ++ if (ctxt == NULL) ++ return; ++ if (ctxt->valueNr < ctxt->valueFrame) { ++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); ++ } ++ ctxt->valueFrame = frame; ++} ++ ++/** + * valuePop: + * @ctxt: an XPath evaluation context + * +@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt) + + if ((ctxt == NULL) || (ctxt->valueNr <= 0)) + return (NULL); ++ ++ if (ctxt->valueNr <= ctxt->valueFrame) { ++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); ++ return (NULL); ++ } ++ + ctxt->valueNr--; + if (ctxt->valueNr > 0) + ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; +@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) { + ret->valueNr = 0; + ret->valueMax = 10; + ret->value = NULL; ++ ret->valueFrame = 0; + + ret->context = ctxt; + ret->comp = comp; +@@ -11711,6 +11755,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; + xmlNodePtr oldContextNode, contextNode = NULL; + xmlXPathContextPtr xpctxt = ctxt->context; ++ int frame; + + #ifdef LIBXML_XPTR_ENABLED + /* +@@ -11730,6 +11775,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + */ + exprOp = &ctxt->comp->steps[op->ch2]; + for (i = 0; i < set->nodeNr; i++) { ++ xmlXPathObjectPtr tmp; ++ + if (set->nodeTab[i] == NULL) + continue; + +@@ -11757,23 +11804,25 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathNodeSetAddUnique(contextObj->nodesetval, + contextNode); + ++ frame = xmlXPathSetFrame(ctxt); + valuePush(ctxt, contextObj); + res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1); ++ tmp = valuePop(ctxt); ++ xmlXPathPopFrame(ctxt, frame); + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { +- xmlXPathObjectPtr tmp; +- /* pop the result if any */ +- tmp = valuePop(ctxt); +- if (tmp != contextObj) { ++ while (tmp != contextObj) { + /* + * Free up the result + * then pop off contextObj, which will be freed later + */ + xmlXPathReleaseObject(xpctxt, tmp); +- valuePop(ctxt); ++ tmp = valuePop(ctxt); + } + goto evaluation_error; + } ++ /* push the result back onto the stack */ ++ valuePush(ctxt, tmp); + + if (res) + pos++; +@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlXPathFunction func; + const xmlChar *oldFunc, *oldFuncURI; + int i; ++ int frame; + ++ frame = xmlXPathSetFrame(ctxt); + if (op->ch1 != -1) + total += + xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); +@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: parameter error\n"); + ctxt->error = XPATH_INVALID_OPERAND; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } +- for (i = 0; i < op->value; i++) ++ for (i = 0; i < op->value; i++) { + if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: parameter error\n"); + ctxt->error = XPATH_INVALID_OPERAND; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } ++ } + if (op->cache != NULL) + XML_CAST_FPTR(func) = op->cache; + else { +@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", + (char *)op->value4, (char *)op->value5); ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } + func = xmlXPathFunctionLookupNS(ctxt->context, +@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + func(ctxt, op->value); + ctxt->context->function = oldFunc; + ctxt->context->functionURI = oldFuncURI; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } + case XPATH_OP_ARG: +@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool) + ctxt->valueNr = 0; + ctxt->valueMax = 10; + ctxt->value = NULL; ++ ctxt->valueFrame = 0; + } + #ifdef XPATH_STREAMING + if (ctxt->comp->stream) { +diff --git a/xpointer.c b/xpointer.c +index 7a42d02..37afa3a 100644 +--- a/xpointer.c ++++ b/xpointer.c +@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) { + ctxt->valueNr = 0; + ctxt->valueMax = 10; + ctxt->value = NULL; ++ ctxt->valueFrame = 0; + } + SKIP_BLANKS; + if (CUR == '/') { +-- +cgit v0.9.0.2 diff --git a/libxml2/CVE-2011-2834.patch b/libxml2/CVE-2011-2834.patch new file mode 100644 index 0000000..a12a050 --- /dev/null +++ b/libxml2/CVE-2011-2834.patch @@ -0,0 +1,62 @@ +From 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard(a)redhat.com> +Date: Tue, 11 Oct 2011 08:34:34 +0000 +Subject: Fix missing error status in XPath evaluation + +Started by Chris Evans, I added a few more place where the +error should have been set in the evaluation context. +--- +diff --git a/xpath.c b/xpath.c +index bcee2ea..d9d902c 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value) + sizeof(ctxt->valueTab[0])); + if (tmp == NULL) { + xmlGenericError(xmlGenericErrorContext, "realloc failed !\n"); ++ ctxt->error = XPATH_MEMORY_ERROR; + return (0); + } + ctxt->valueMax *= 2; +@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { + if ( (ch & 0xc0) != 0xc0 ) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathTranslateFunction: Invalid UTF8 string\n"); ++ /* not asserting an XPath error is probably better */ + break; + } + /* then skip over remaining bytes for this char */ +@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { + if ( (*cptr++ & 0xc0) != 0x80 ) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathTranslateFunction: Invalid UTF8 string\n"); ++ /* not asserting an XPath error is probably better */ + break; + } + if (ch & 0x80) /* must have had error encountered */ +@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n", + (char *) op->value4, (char *)op->value5); ++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; + return (total); + } + val = xmlXPathVariableLookupNS(ctxt->context, +@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", + (char *)op->value4, (char *)op->value5); + xmlXPathPopFrame(ctxt, frame); ++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; + return (total); + } + func = xmlXPathFunctionLookupNS(ctxt->context, +@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + } + xmlGenericError(xmlGenericErrorContext, + "XPath: unknown precompiled operation %d\n", op->op); ++ ctxt->error = XPATH_INVALID_OPERAND; + return (total); + } + +-- +cgit v0.9.0.2 diff --git a/libxml2/CVE-2011-3905.patch b/libxml2/CVE-2011-3905.patch new file mode 100644 index 0000000..439f450 --- /dev/null +++ b/libxml2/CVE-2011-3905.patch @@ -0,0 +1,62 @@ +From 77404b8b69bc122d12231807abf1a837d121b551 Mon Sep 17 00:00:00 2001 +From: Chris Evans <scarybeasts(a)gmail.com> +Date: Wed, 14 Dec 2011 08:18:25 +0000 +Subject: Make sure the parser returns when getting a Stop order + +patch backported from chromiun bug fixes, assuming author is Chris +--- +diff --git a/parser.c b/parser.c +index 21d7aa3..4e5dcb9 100644 +--- a/parser.c ++++ b/parser.c +@@ -4949,7 +4949,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { + (ctxt->sax->processingInstruction != NULL)) + ctxt->sax->processingInstruction(ctxt->userData, + target, NULL); +- ctxt->instate = state; ++ if (ctxt->instate != XML_PARSER_EOF) ++ ctxt->instate = state; + return; + } + buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar)); +@@ -5029,7 +5030,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { + } else { + xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL); + } +- ctxt->instate = state; ++ if (ctxt->instate != XML_PARSER_EOF) ++ ctxt->instate = state; + } + } + +@@ -9589,6 +9591,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) { + else + name = xmlParseStartTag(ctxt); + #endif /* LIBXML_SAX1_ENABLED */ ++ if (ctxt->instate == XML_PARSER_EOF) ++ return; + if (name == NULL) { + spacePop(ctxt); + return; +@@ -10975,6 +10979,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { + else + name = xmlParseStartTag(ctxt); + #endif /* LIBXML_SAX1_ENABLED */ ++ if (ctxt->instate == XML_PARSER_EOF) ++ goto done; + if (name == NULL) { + spacePop(ctxt); + ctxt->instate = XML_PARSER_EOF; +@@ -11161,7 +11167,9 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { + else + xmlParseEndTag1(ctxt, 0); + #endif /* LIBXML_SAX1_ENABLED */ +- if (ctxt->nameNr == 0) { ++ if (ctxt->instate == XML_PARSER_EOF) { ++ /* Nothing */ ++ } else if (ctxt->nameNr == 0) { + ctxt->instate = XML_PARSER_EPILOG; + } else { + ctxt->instate = XML_PARSER_CONTENT; +-- +cgit v0.9.0.2 diff --git a/libxml2/CVE-2011-3919.patch b/libxml2/CVE-2011-3919.patch new file mode 100644 index 0000000..c0d9433 --- /dev/null +++ b/libxml2/CVE-2011-3919.patch @@ -0,0 +1,21 @@ +From 5bd3c061823a8499b27422aee04ea20aae24f03e Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard(a)redhat.com> +Date: Fri, 16 Dec 2011 10:53:35 +0000 +Subject: Fix an allocation error when copying entities + +--- +diff --git a/parser.c b/parser.c +index 4e5dcb9..c55e41d 100644 +--- a/parser.c ++++ b/parser.c +@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + + buffer[nbchars++] = '&'; + if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) { +- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); + } + for (;i > 0;i--) + buffer[nbchars++] = *cur++; +-- +cgit v0.9.0.2 diff --git a/libxml2/Pkgfile b/libxml2/Pkgfile index 05d97dc..63e5b52 100644 --- a/libxml2/Pkgfile +++ b/libxml2/Pkgfile @@ -6,12 +6,16 @@ name=libxml2 version=2.7.8 -release=1 -source=(ftp://xmlsoft.org/libxml2/$name-$version.tar.gz) +release=2 +source=(ftp://xmlsoft.org/libxml2/$name-$version.tar.gz + CVE-2010-4494.patch + CVE-2011-{0216,2821,2834,3905,3919}.patch) build () { cd $name-$version - + + cat $SRC/CVE-201?-*.patch | patch -p1 + # http://mail.gnome.org/archives/xml/2010-November/msg00016.html sed -i '/VERSION_SCRIPT_FLAGS/s/-z/-n/' configure

1 0

ports/opt (2.7): [notify] samba: update to 3.6.3
by crux＠crux.nu 30 Jan '12

30 Jan '12

commit 2b107c1f28cdf62ffb897f63e5d5ab36a7fd5c17 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jan 30 16:44:50 2012 +0100 [notify] samba: update to 3.6.3 Security fix, see http://www.samba.org/samba/history/samba-3.6.3.html diff --git a/samba/.md5sum b/samba/.md5sum index 1a28f95..3309cd0 100644 --- a/samba/.md5sum +++ b/samba/.md5sum @@ -1,3 +1,3 @@ 448caca4745aef1a842f4fdb1aa62e1e samba -bd2bb63b1c90161b88262f813bd1ce8b samba-3.6.2.tar.gz +98ac9db9f4b6ebfc3f013aa193ffb0d1 samba-3.6.3.tar.gz fbaccda19afc8f75f6f0123cab82c87e samba-config.patch diff --git a/samba/Pkgfile b/samba/Pkgfile index 3d0fff8..2b60ed6 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses openssl readline zlib tdb talloc libcap acl name=samba -version=3.6.2 +version=3.6.3 release=1 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ samba-config.patch samba)

1 0

ports/core (2.7): [notify] sudo: update to 1.8.3p2
by crux＠crux.nu 30 Jan '12

30 Jan '12

commit 3c54ccc151266214fa14f1d146733fc1fcb7e3ce Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jan 30 16:42:05 2012 +0100 [notify] sudo: update to 1.8.3p2 Security fix, see http://www.sudo.ws/sudo/alerts/sudo_debug.html diff --git a/sudo/.md5sum b/sudo/.md5sum index 6ed9eb0..ecff11a 100644 --- a/sudo/.md5sum +++ b/sudo/.md5sum @@ -1 +1 @@ -7becc572fa97f94cf721a2ee8299c45b sudo-1.8.3p1.tar.gz +6d4282a1530c541f7900fa8dfcf2a882 sudo-1.8.3p2.tar.gz diff --git a/sudo/Pkgfile b/sudo/Pkgfile index 08ee1c0..29c1409 100644 --- a/sudo/Pkgfile +++ b/sudo/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib name=sudo -version=1.8.3p1 +version=1.8.3p2 release=1 source=(http://www.sudo.ws/$name/dist/$name-$version.tar.gz)

1 0

abandoned haskell (and wzff) repositories, some ports in contrib and crux-bin third-party project
by Moritz Wilhelmy 26 Jan '12

26 Jan '12

Hello folks, I currently don't have a CRUX machine to work on my previous ports collections haskell and wzff. wzff is largely irrelevant, but haskell might be of interest for some individuals involved with the language. Since my server was moved, the repositories have gone offline, but I reuploaded the git repository to my bitbucket account. https://bitbucket.org/wilhelmy/ports If someone would be interested in taking over any of it, please do, because that always beats letting it rot beyond all repair. I also had a few (not many, really) packages in contrib, which I won't be able to maintain for a while. Maybe I'll be back on CRUX someday, but I can't really tell whether this is going to happen or not. You guys sure are fun, you maintain a great distribution, and I will certainly stick around and comment on all the things I'm not supposed to comment.. Also, if anyone is interested in the leftovers from the crux-bin toolchain, please let me know. Best, Moritz

2 1

ports/core (2.7): [notify] curl: update to 7.24.0
by crux＠crux.nu 25 Jan '12

25 Jan '12

commit 229dbbfec8b992ef95ee059a09d3ba8e458a9436 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Jan 25 16:40:22 2012 +0100 [notify] curl: update to 7.24.0 Update encloses among others two security fixes, see: - http://curl.haxx.se/docs/adv_20120124.html - http://curl.haxx.se/docs/adv_20120124B.html diff --git a/curl/.md5sum b/curl/.md5sum index b417d66..1a65fc7 100644 --- a/curl/.md5sum +++ b/curl/.md5sum @@ -1 +1 @@ -af901db5f3d21609cc6fe960a6c293fb curl-7.23.0.tar.lzma +713d7d7cbc5cfaabd785a2ff905096f2 curl-7.24.0.tar.lzma diff --git a/curl/Pkgfile b/curl/Pkgfile index f437f04..390e516 100644 --- a/curl/Pkgfile +++ b/curl/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl, zlib name=curl -version=7.23.0 +version=7.24.0 release=1 source=(http://curl.haxx.se/download/$name-$version.tar.lzma)

1 0

ports/opt (2.7): [notify] wpa_supplicant: added support for nl80211 configuration interface, new dependency libnl
by crux＠crux.nu 23 Jan '12

23 Jan '12

commit 0bfb20cb3acba64410cf279b73a0fba3c793fc4c Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jan 23 18:47:06 2012 +0100 [notify] wpa_supplicant: added support for nl80211 configuration interface, new dependency libnl See http://linuxwireless.org/ for documentation diff --git a/wpa_supplicant/.footprint b/wpa_supplicant/.footprint index c1d554d..3cf369d 100644 --- a/wpa_supplicant/.footprint +++ b/wpa_supplicant/.footprint @@ -3,12 +3,12 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man5/ --rwxr-xr-x root/root usr/man/man5/wpa_supplicant.conf.5.gz +-rw-r--r-- root/root usr/man/man5/wpa_supplicant.conf.5.gz drwxr-xr-x root/root usr/man/man8/ --rwxr-xr-x root/root usr/man/man8/wpa_background.8.gz --rwxr-xr-x root/root usr/man/man8/wpa_cli.8.gz --rwxr-xr-x root/root usr/man/man8/wpa_passphrase.8.gz --rwxr-xr-x root/root usr/man/man8/wpa_supplicant.8.gz +-rw-r--r-- root/root usr/man/man8/wpa_background.8.gz +-rw-r--r-- root/root usr/man/man8/wpa_cli.8.gz +-rw-r--r-- root/root usr/man/man8/wpa_passphrase.8.gz +-rw-r--r-- root/root usr/man/man8/wpa_supplicant.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/wpa_cli -rwxr-xr-x root/root usr/sbin/wpa_passphrase diff --git a/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile index 291fcbd..787ec8a 100644 --- a/wpa_supplicant/Pkgfile +++ b/wpa_supplicant/Pkgfile @@ -1,22 +1,27 @@ # Description: User space IEEE 802.1X/WPA supplicant (wireless client) # URL: http://hostap.epitest.fi/wpa_supplicant/ # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: openssl ncurses readline +# Depends on: openssl ncurses readline libnl name=wpa_supplicant version=0.7.3 -release=1 +release=2 source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz) build () { cd $name-$version/$name + cp defconfig .config + echo "CONFIG_DRIVER_NL80211=y" >> .config echo "CONFIG_READLINE=y" >> .config + make + install -d $PKG/{usr/sbin,usr/man/man{8,5},etc} - install wpa_{cli,passphrase,supplicant} $PKG/usr/sbin - install doc/docbook/wpa_{background,cli,passphrase,supplicant}.8 $PKG/usr/man/man8 - install doc/docbook/wpa_supplicant.conf.5 $PKG/usr/man/man5 + install -m 0755 wpa_{cli,passphrase,supplicant} $PKG/usr/sbin + install -m 0644 doc/docbook/wpa_{background,cli,passphrase,supplicant}.8 $PKG/usr/man/man8 + install -m 0644 doc/docbook/wpa_supplicant.conf.5 $PKG/usr/man/man5 + echo -e "ctrl_interface=/var/run/wpa_supplicant\n" > $PKG/etc/wpa.conf chmod 0600 $PKG/etc/wpa.conf } diff --git a/wpa_supplicant/README b/wpa_supplicant/README index 300fc8b..71dbfc9 100644 --- a/wpa_supplicant/README +++ b/wpa_supplicant/README @@ -28,13 +28,11 @@ POST-INSTALL /sbin/modprobe ipw2100 /sbin/ifconfig eth1 xxx.xxx.xxx.xxx netmask 255.255.255.xxx /sbin/route add default gw xxx.xxx.xxx.xxx - /usr/sbin/wpa_supplicant -B -Dwext -ieth1 -c/etc/wpa.conf - - Note: the above configuration makes use of the generic wext - wpa_supplicant driver (Linux wireless extensions), - which is the preferred nowadays. Use this driver for - ndiswrapper as well. + /usr/sbin/wpa_supplicant -B -Dnl80211 -ieth1 -c/etc/wpa.conf + Note: the above configuration makes use of the generic nl80211 + wpa_supplicant driver, which is the preferred nowadays + and supersedes the wext (wireless extensions) driver. PRECAUTION

1 0

Relinking X applications against libXaw3d
by Hazel Russman 23 Jan '12

23 Jan '12

Is there a simple way to rebuild X applications such as xterm against libXaw3d? I have just installed Xaw3d-1.5 from opt, which provides libXaw3d.so.8, whereas my libXaw is .so.7 (libXaw.so.6 also gets installed from the xorg-libxaw package but I haven't found anything actually linked to it). If I create a link libXaw8.so to libXaw3d.so and rebuild apps like xterm, will they then automatically link to the 3d library? Or do I have to reset the libXaw.so link as well? And if I do, what effect will this have on existing apps? -- Hazel Russman <hazel_russman(a)yahoo.co.uk>

1 0

ports/core (2.7): [notify] openssl: update to 1.0.0g
by crux＠crux.nu 19 Jan '12

19 Jan '12

commit 827b914899b6d23966cce17845efd85a9ecdf599 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Jan 19 12:20:07 2012 +0100 [notify] openssl: update to 1.0.0g Security fix, see http://www.openssl.org/news/secadv_20120118.txt diff --git a/openssl/.md5sum b/openssl/.md5sum index e9b6d8a..7734023 100644 --- a/openssl/.md5sum +++ b/openssl/.md5sum @@ -1,2 +1,2 @@ 9d0df57845af8acd1027a7df5c18d017 mksslcert.sh -e358705fb4a8827b5e9224a73f442025 openssl-1.0.0f.tar.gz +07ecbe4324f140d157478637d6beccf1 openssl-1.0.0g.tar.gz diff --git a/openssl/Pkgfile b/openssl/Pkgfile index ceac511..033749e 100644 --- a/openssl/Pkgfile +++ b/openssl/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=openssl -version=1.0.0f +version=1.0.0g release=1 source=(http://www.openssl.org/source/$name-$version.tar.gz \ mksslcert.sh)

1 0

Adobereader crashes every second print - CUPS patch
by Bernd Eggink 17 Jan '12

17 Jan '12

Since cups-1.4.4 the standalone adobereader crashes when "file/print" is selected the 2n time in a session. I found a discussion about this here: http://www.linuxquestions.org/questions/slackware-14/adobe-reader-9-crash-o… There's a link to a patch for cups (https://bugzillafiles.novell.org/attachment.cgi?id=371760) which corrects this annoying behaviour. The patch is made for cups-1.4.4, but also works well with cups-1.4.8 after some small changes; I attach the adjusted version. IMHO it would be a good idea to include it in the official cups port. Greetings, Bernd -- http://sudrala.de

2 2

ports/opt (2.7): [notify] cups: update to 1.5.0
by crux＠crux.nu 15 Jan '12

15 Jan '12

commit d112d9405c74edfec73334b4bbc0054f255fb11e Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 15 16:33:02 2012 +0100 [notify] cups: update to 1.5.0 the kernel module 'usblp' is no longer supported, see README diff --git a/cups/.footprint b/cups/.footprint index ac88770..024b6a1 100644 --- a/cups/.footprint +++ b/cups/.footprint @@ -1,3 +1,6 @@ +drwxr-xr-x root/root Resources/ +drwxr-xr-x root/root Resources/English.lproj/ +-rw-r--r-- root/root Resources/English.lproj/cups.strings drwxr-xr-x root/root etc/ drwxr-xr-x root/lp etc/cups/ -rw-r----- root/lp etc/cups/cupsd.conf @@ -6,6 +9,8 @@ drwxr-xr-x root/lp etc/cups/interfaces/ drwxr-xr-x root/lp etc/cups/ppd/ -rw-r----- root/lp etc/cups/snmp.conf drwx------ root/lp etc/cups/ssl/ +drwxr-xr-x root/root etc/modprobe.d/ +-rw-r--r-- root/root etc/modprobe.d/cups.conf drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/cups drwxr-xr-x root/root etc/ssl/ @@ -19,6 +24,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/cups-config -rwxr-xr-x root/root usr/bin/cupstestdsc -rwxr-xr-x root/root usr/bin/cupstestppd +-rwxr-xr-x root/root usr/bin/ipptool -rwxr-xr-x root/root usr/bin/lp -rwxr-xr-x root/root usr/bin/lpoptions -rwxr-xr-x root/root usr/bin/lppasswd @@ -57,10 +63,11 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cups/ drwxr-xr-x root/root usr/lib/cups/backend/ lrwxrwxrwx root/root usr/lib/cups/backend/http -> ipp +lrwxrwxrwx root/root usr/lib/cups/backend/https -> ipp -rwx------ root/root usr/lib/cups/backend/ipp +lrwxrwxrwx root/root usr/lib/cups/backend/ipps -> ipp -rwx------ root/root usr/lib/cups/backend/lpd -rwxr-xr-x root/root usr/lib/cups/backend/parallel --rwxr-xr-x root/root usr/lib/cups/backend/scsi -rwxr-xr-x root/root usr/lib/cups/backend/serial -rwxr-xr-x root/root usr/lib/cups/backend/snmp -rwxr-xr-x root/root usr/lib/cups/backend/socket @@ -74,6 +81,7 @@ drwxr-xr-x root/root usr/lib/cups/cgi-bin/ drwxr-xr-x root/root usr/lib/cups/daemon/ -rwxr-xr-x root/root usr/lib/cups/daemon/cups-deviced -rwxr-xr-x root/root usr/lib/cups/daemon/cups-driverd +-rwxr-xr-x root/root usr/lib/cups/daemon/cups-exec -rwxr-xr-x root/root usr/lib/cups/daemon/cups-lpd -rwxr-xr-x root/root usr/lib/cups/daemon/cups-polld drwxr-xr-x root/root usr/lib/cups/driver/ @@ -83,7 +91,6 @@ drwxr-xr-x root/root usr/lib/cups/filter/ -rwxr-xr-x root/root usr/lib/cups/filter/commandtopclx -rwxr-xr-x root/root usr/lib/cups/filter/commandtops -rwxr-xr-x root/root usr/lib/cups/filter/gziptoany --rwxr-xr-x root/root usr/lib/cups/filter/hpgltops -rwxr-xr-x root/root usr/lib/cups/filter/imagetops -rwxr-xr-x root/root usr/lib/cups/filter/imagetoraster -rwxr-xr-x root/root usr/lib/cups/filter/pdftops @@ -94,6 +101,7 @@ lrwxrwxrwx root/root usr/lib/cups/filter/rastertodymo -> rastertolabel -rwxr-xr-x root/root usr/lib/cups/filter/rastertohp -rwxr-xr-x root/root usr/lib/cups/filter/rastertolabel -rwxr-xr-x root/root usr/lib/cups/filter/rastertopclx +-rwxr-xr-x root/root usr/lib/cups/filter/rastertopwg -rwxr-xr-x root/root usr/lib/cups/filter/texttops drwxr-xr-x root/root usr/lib/cups/monitor/ -rwxr-xr-x root/root usr/lib/cups/monitor/bcp @@ -119,6 +127,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/cups-config.1.gz -rw-r--r-- root/root usr/man/man1/cupstestdsc.1.gz -rw-r--r-- root/root usr/man/man1/cupstestppd.1.gz +-rw-r--r-- root/root usr/man/man1/ipptool.1.gz -rw-r--r-- root/root usr/man/man1/lp.1.gz -rw-r--r-- root/root usr/man/man1/lpoptions.1.gz -rw-r--r-- root/root usr/man/man1/lppasswd.1.gz @@ -136,6 +145,7 @@ drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/client.conf.5.gz -rw-r--r-- root/root usr/man/man5/cups-snmp.conf.5.gz -rw-r--r-- root/root usr/man/man5/cupsd.conf.5.gz +-rw-r--r-- root/root usr/man/man5/ipptoolfile.5.gz -rw-r--r-- root/root usr/man/man5/mailto.conf.5.gz -rw-r--r-- root/root usr/man/man5/mime.convs.5.gz -rw-r--r-- root/root usr/man/man5/mime.types.5.gz @@ -189,49 +199,9 @@ drwxr-xr-x root/root usr/share/cups/banners/ -rw-r--r-- root/root usr/share/cups/banners/standard -rw-r--r-- root/root usr/share/cups/banners/topsecret -rw-r--r-- root/root usr/share/cups/banners/unclassified -drwxr-xr-x root/root usr/share/cups/charmaps/ --rw-r--r-- root/root usr/share/cups/charmaps/euc-cn.txt --rw-r--r-- root/root usr/share/cups/charmaps/euc-jp.txt --rw-r--r-- root/root usr/share/cups/charmaps/euc-kr.txt --rw-r--r-- root/root usr/share/cups/charmaps/euc-tw.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-1.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-10.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-11.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-13.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-14.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-15.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-16.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-2.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-3.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-4.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-5.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-6.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-7.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-8.txt --rw-r--r-- root/root usr/share/cups/charmaps/iso-8859-9.txt --rw-r--r-- root/root usr/share/cups/charmaps/jis-x0213.txt --rw-r--r-- root/root usr/share/cups/charmaps/koi8-r.txt --rw-r--r-- root/root usr/share/cups/charmaps/koi8-u.txt --rw-r--r-- root/root usr/share/cups/charmaps/mac-roman.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1250.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1251.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1252.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1253.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1254.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1255.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1256.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1257.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1258.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-1361.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-874.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-932.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-936.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-949.txt --rw-r--r-- root/root usr/share/cups/charmaps/windows-950.txt drwxr-xr-x root/root usr/share/cups/charsets/ -rw-r--r-- root/root usr/share/cups/charsets/utf-8 drwxr-xr-x root/root usr/share/cups/data/ --rw-r--r-- root/root usr/share/cups/data/HPGLprolog -rw-r--r-- root/root usr/share/cups/data/psglyphs -rw-r--r-- root/root usr/share/cups/data/testprint drwxr-xr-x root/root usr/share/cups/doc/ @@ -267,6 +237,8 @@ drwxr-xr-x root/root usr/share/cups/doc/help/ -rw-r--r-- root/root usr/share/cups/doc/help/man-cupstestdsc.html -rw-r--r-- root/root usr/share/cups/doc/help/man-cupstestppd.html -rw-r--r-- root/root usr/share/cups/doc/help/man-filter.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-ipptool.html +-rw-r--r-- root/root usr/share/cups/doc/help/man-ipptoolfile.html -rw-r--r-- root/root usr/share/cups/doc/help/man-lp.html -rw-r--r-- root/root usr/share/cups/doc/help/man-lpadmin.html -rw-r--r-- root/root usr/share/cups/doc/help/man-lpc.html @@ -359,6 +331,17 @@ drwxr-xr-x root/root usr/share/cups/fonts/ -rw-r--r-- root/root usr/share/cups/fonts/Monospace-Bold -rw-r--r-- root/root usr/share/cups/fonts/Monospace-BoldOblique -rw-r--r-- root/root usr/share/cups/fonts/Monospace-Oblique +drwxr-xr-x root/root usr/share/cups/ipptool/ +-rw-r--r-- root/root usr/share/cups/ipptool/create-printer-subscription.test +-rw-r--r-- root/root usr/share/cups/ipptool/get-completed-jobs.test +-rw-r--r-- root/root usr/share/cups/ipptool/get-jobs.test +-rw-r--r-- root/root usr/share/cups/ipptool/ipp-1.1.test +-rw-r--r-- root/root usr/share/cups/ipptool/ipp-2.0.test +-rw-r--r-- root/root usr/share/cups/ipptool/ipp-2.1.test +-rw-r--r-- root/root usr/share/cups/ipptool/testfile.jpg +-rw-r--r-- root/root usr/share/cups/ipptool/testfile.pdf +-rw-r--r-- root/root usr/share/cups/ipptool/testfile.ps +-rw-r--r-- root/root usr/share/cups/ipptool/testfile.txt drwxr-xr-x root/root usr/share/cups/mime/ -rw-r--r-- root/root usr/share/cups/mime/mime.convs -rw-r--r-- root/root usr/share/cups/mime/mime.types diff --git a/cups/.md5sum b/cups/.md5sum index 8c8ead5..136c429 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,4 +1,5 @@ 01b6a755c5b0fb7df2d2c94571f67e1d cups -0ec52d3f3c69bc2ab5ed70c594edbce6 cups-1.4.8-source.tar.bz2 +e54ed09ede2340fc3014913333520fe4 cups-1.5.0-source.tar.bz2 2220f411940c4f7504ed4457c6304d4a cups-config.patch -4a94252a0deb74c6fe12f373be576182 usb-backend-both-usblp-and-libusb.dpatch +6f0218c33be40ef6469965df26a55bd6 usb-backend-gracefully-fail-on-more-cases-of-bad-device-id.patch +c8ece8955359cb85c044ea8ec50690fa usb-skip-interface-altsetting.patch diff --git a/cups/Pkgfile b/cups/Pkgfile index 1689704..58c7d22 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -4,16 +4,19 @@ # Depends on: acl tcp_wrappers libusb-compat libpng libtiff openssl poppler name=cups -version=1.4.8 -release=3 +version=1.5.0 +release=1 source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.b… - cups-config.patch cups usb-backend-both-usblp-and-libusb.dpatch) + cups-config.patch cups + usb-backend-gracefully-fail-on-more-cases-of-bad-device-id.patch + usb-skip-interface-altsetting.patch) build () { cd $name-$version patch -p1 -i $SRC/cups-config.patch - patch -p1 -i $SRC/usb-backend-both-usblp-and-libusb.dpatch + patch -p1 -i $SRC/usb-backend-gracefully-fail-on-more-cases-of-bad-device-id.patch + patch -p0 -d backend -i $SRC/usb-skip-interface-altsetting.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -47,4 +50,8 @@ build () { chmod 0600 $PKG/etc/ssl/{keys/cups.key,certs/cups.crt} install -D -m 755 $SRC/cups $PKG/etc/rc.d/cups + + # blacklist usblp kernel module + install -d $PKG/etc/modprobe.d + echo 'blacklist usblp' > $PKG/etc/modprobe.d/cups.conf } diff --git a/cups/README b/cups/README index eb2d77a..45fb657 100644 --- a/cups/README +++ b/cups/README @@ -1,9 +1,10 @@ -README for cups 1.3.x +README for cups 1.5.x REQUIREMENTS -1. This version of cups no longer includes a postscript interpreter. Install - the ghostscript port additionally. +1. As of version 1.5 cups needs libusb to print to usb printers, the kernel + modules usblp is no longer supported. + The port installs /etc/modprobe.de/cups.conf to blacklist the module. 2. In order to have more printer drivers available, the installation of the gutenprint port (formerly gimp-print) is recommended. HP DeskJet/LaserJet users should install the hpijs driver. @@ -28,12 +29,10 @@ NOT you must have foomatic-filters installed and must generate a PPD file PRE-INSTALL -1. Remove a installed lprng package. - Cups and lprng cannot be installed together. - POST-INSTALL -1. Configure your printer with the web-interface, http://localhost:631. +1. Remove the usblp kernel module before starting cups. +2. Configure your printer with the web-interface, http://localhost:631. PRECAUTION diff --git a/cups/usb-backend-both-usblp-and-libusb.dpatch b/cups/usb-backend-both-usblp-and-libusb.dpatch deleted file mode 100644 index 88ae9d0..0000000 --- a/cups/usb-backend-both-usblp-and-libusb.dpatch +++ /dev/null @@ -1,574 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## usb-backend-both-usblp-and-libusb.dpatch by <till.kamppeter(a)gmail.com> -## -## DP: http://www.cups.org/str.php?L3357 - -@DPATCH@ -diff -urNad cups-1.4.3~/backend/Makefile cups-1.4.3/backend/Makefile ---- cups-1.4.3~/backend/Makefile 2010-04-09 15:56:03.735720821 +0200 -+++ cups-1.4.3/backend/Makefile 2010-04-09 15:56:04.335705387 +0200 -@@ -267,7 +267,7 @@ - echo Linking $@... - $(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \ - $(BACKLIBS) $(LIBS) --usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c -+usb.o: usb.c usb-darwin.c usb-hybrid.c usb-libusb.c usb-unix.c - - - # -diff -urNad cups-1.4.3~/backend/ieee1284.c cups-1.4.3/backend/ieee1284.c ---- cups-1.4.3~/backend/ieee1284.c 2009-12-08 03:13:42.000000000 +0100 -+++ cups-1.4.3/backend/ieee1284.c 2010-04-09 15:56:04.335705387 +0200 -@@ -255,6 +255,7 @@ - cups_option_t *values; /* Keys and values in device ID */ - const char *mfg, /* Manufacturer */ - *mdl, /* Model */ -+ *des, /* Description */ - *sern; /* Serial number */ - char temp[256], /* Temporary manufacturer string */ - *tempptr; /* Pointer into temp string */ -@@ -285,10 +286,20 @@ - } - else - { -- strlcpy(temp, make_model, sizeof(temp)); -+ /* -+ * No manufacturer? Use the model string or description... -+ */ -+ -+ if (mdl) -+ _ppdNormalizeMakeAndModel(mdl, temp, sizeof(temp)); -+ else if ((des = cupsGetOption("DESCRIPTION", num_values, values)) != NULL || -+ (des = cupsGetOption("DES", num_values, values)) != NULL) -+ _ppdNormalizeMakeAndModel(des, temp, sizeof(temp)); -+ else -+ strlcpy(temp, "Unknown", sizeof(temp)); - - if ((tempptr = strchr(temp, ' ')) != NULL) -- *tempptr = '\0'; -+ *tempptr = '\0'; - - mfg = temp; - } -diff -urNad cups-1.4.3~/backend/usb-hybrid.c cups-1.4.3/backend/usb-hybrid.c ---- cups-1.4.3~/backend/usb-hybrid.c 1970-01-01 01:00:00.000000000 +0100 -+++ cups-1.4.3/backend/usb-hybrid.c 2010-04-09 15:56:04.345707078 +0200 -@@ -0,0 +1,87 @@ -+/* -+ * "$Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike $" -+ * -+ * USB port backend for the Common UNIX Printing System (CUPS). -+ * -+ * This file is included from "usb.c" when compiled on Linux. -+ * -+ * Copyright 2007-2008 by Apple Inc. -+ * Copyright 1997-2007 by Easy Software Products, all rights reserved. -+ * -+ * These coded instructions, statements, and computer programs are the -+ * property of Apple Inc. and are protected by Federal copyright -+ * law. Distribution and use rights are outlined in the file "LICENSE.txt" -+ * "LICENSE" which should have been included with this file. If this -+ * file is missing or damaged, see the license at "http://www.cups.org/". -+ * -+ * This file is subject to the Apple OS-Developed Software exception. -+ * -+ * Contents: -+ * -+ * print_device() - Print a file to a USB device. -+ * list_devices() - List all USB devices. -+ */ -+ -+/* -+ * Include necessary headers. -+ */ -+ -+#include <sys/select.h> -+ -+/* -+ * Include the two USB implementations used under Linux ... -+ */ -+ -+#include "usb-libusb.c" -+#include "usb-unix.c" -+ -+/* -+ * 'print_device()' - Print a file to a USB device. -+ */ -+ -+int /* O - Exit status */ -+print_device(const char *uri, /* I - Device URI */ -+ const char *hostname, /* I - Hostname/manufacturer */ -+ const char *resource, /* I - Resource/modelname */ -+ char *options, /* I - Device options/serial number */ -+ int print_fd, /* I - File descriptor to print */ -+ int copies, /* I - Copies to print */ -+ int argc, /* I - Number of command-line arguments (6 or 7) */ -+ char *argv[]) /* I - Command-line arguments */ -+{ -+ int result; -+ for(;;) -+ { -+ result = print_device_unix(uri, hostname, resource, options, print_fd, -+ copies, argc, argv); -+ if (result == -1) -+ { -+ result = print_device_libusb(uri, hostname, resource, options, print_fd, -+ copies, argc, argv); -+ if (result == -1) -+ sleep(5); -+ else -+ return(result); -+ } -+ else -+ return(result); -+ } -+} -+ -+/* -+ * 'list_devices()' - List all USB devices. -+ */ -+ -+void -+list_devices(void) -+{ -+ /* Try both discovery methods, each device will appear only under one -+ of them */ -+ list_devices_libusb(); -+ list_devices_unix(); -+} -+ -+ -+/* -+ * End of "$Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike $". -+ */ -diff -urNad cups-1.4.3~/backend/usb-libusb.c cups-1.4.3/backend/usb-libusb.c ---- cups-1.4.3~/backend/usb-libusb.c 2009-09-11 22:03:31.000000000 +0200 -+++ cups-1.4.3/backend/usb-libusb.c 2010-04-09 15:56:04.345707078 +0200 -@@ -13,16 +13,16 @@ - * - * Contents: - * -- * list_devices() - List the available printers. -- * print_device() - Print a file to a USB device. -+ * list_devices_libusb() - List the available printers. -+ * print_device_libusb() - Print a file to a USB device. - * close_device() - Close the connection to the USB printer. - * find_device() - Find or enumerate USB printers. - * get_device_id() - Get the IEEE-1284 device ID for the printer. - * list_cb() - List USB printers for discovery. - * make_device_uri() - Create a device URI for a USB printer. -- * open_device() - Open a connection to the USB printer. -+ * open_device_libusb() - Open a connection to the USB printer. - * print_cb() - Find a USB printer for printing. -- * side_cb() - Handle side-channel requests. -+ * side_cb_libusb() - Handle side-channel requests. - */ - - /* -@@ -65,30 +65,30 @@ - static char *make_device_uri(usb_printer_t *printer, - const char *device_id, - char *uri, size_t uri_size); --static int open_device(usb_printer_t *printer, int verbose); -+static int open_device_libusb(usb_printer_t *printer, int verbose); - static int print_cb(usb_printer_t *printer, const char *device_uri, - const char *device_id, const void *data); --static ssize_t side_cb(usb_printer_t *printer, int print_fd); -+static ssize_t side_cb_libusb(usb_printer_t *printer, int print_fd); - - - /* -- * 'list_devices()' - List the available printers. -+ * 'list_devices_libusb()' - List the available printers. - */ - - void --list_devices(void) -+list_devices_libusb(void) - { -- fputs("DEBUG: list_devices\n", stderr); -+ fputs("DEBUG: list_devices_libusb\n", stderr); - find_device(list_cb, NULL); - } - - - /* -- * 'print_device()' - Print a file to a USB device. -+ * 'print_device_libusb()' - Print a file to a USB device. - */ - - int /* O - Exit status */ --print_device(const char *uri, /* I - Device URI */ -+print_device_libusb(const char *uri, /* I - Device URI */ - const char *hostname, /* I - Hostname/manufacturer */ - const char *resource, /* I - Resource/modelname */ - char *options, /* I - Device options/serial number */ -@@ -105,19 +105,23 @@ - struct pollfd pfds[2]; /* Poll descriptors */ - - -- fputs("DEBUG: print_device\n", stderr); -+ fputs("DEBUG: print_device_libusb\n", stderr); - - /* - * Connect to the printer... - */ - -+#if defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) -+ if ((printer = find_device(print_cb, uri)) == NULL) -+ return(-1); -+#else - while ((printer = find_device(print_cb, uri)) == NULL) - { - _cupsLangPuts(stderr, - _("INFO: Waiting for printer to become available...\n")); - sleep(5); - } -- -+#endif - - /* - * If we are printing data from a print driver on stdin, ignore SIGTERM -@@ -189,7 +193,7 @@ - - if (pfds[1].revents & (POLLIN | POLLHUP)) - { -- if ((bytes = side_cb(printer, print_fd)) < 0) -+ if ((bytes = side_cb_libusb(printer, print_fd)) < 0) - pfds[1].events = 0; /* Filter has gone away... */ - else - tbytes += bytes; -@@ -359,7 +363,7 @@ - printer.iface = iface; - printer.handle = NULL; - -- if (!open_device(&printer, data != NULL)) -+ if (!open_device_libusb(&printer, data != NULL)) - { - if (!get_device_id(&printer, device_id, sizeof(device_id))) - { -@@ -583,6 +587,14 @@ - mfg = tempmfg; - } - -+ if (!strncasecmp(mdl, mfg, strlen(mfg))) -+ { -+ mdl += strlen(mfg); -+ -+ while (isspace(*mdl & 255)) -+ mdl ++; -+ } -+ - /* - * Generate the device URI from the manufacturer, model, serial number, - * and interface number... -@@ -611,11 +623,11 @@ - - - /* -- * 'open_device()' - Open a connection to the USB printer. -+ * 'open_device_libusb()' - Open a connection to the USB printer. - */ - - static int /* O - 0 on success, -1 on error */ --open_device(usb_printer_t *printer, /* I - Printer */ -+open_device_libusb(usb_printer_t *printer, /* I - Printer */ - int verbose) /* I - Update connecting-to-device state? */ - { - int number; /* Configuration/interface/altset numbers */ -@@ -733,16 +745,73 @@ - const char *device_id, /* I - IEEE-1284 device ID */ - const void *data) /* I - User data (make, model, S/N) */ - { -- return (!strcmp((char *)data, device_uri)); -+ char *uri = (char *)data, -+ *str1, -+ *str2, -+ buf[255], -+ requested_uri[1024]; -+ -+ /* Work on a copy of uri */ -+ strncpy(requested_uri, uri, sizeof(requested_uri)); -+ requested_uri[sizeof(requested_uri) - 1] = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have an "interface" specification and this -+ * never happens for usblp-discovered URIs, so remove the "interface" -+ * specification from the URI which we are checking currently. This way a -+ * queue for a usblp-discovered printer can now be accessed via libusb -+ */ -+ if (((str1 = strstr(requested_uri, "interface=")) == NULL) && -+ ((str2 = strstr(device_uri, "interface=")) != NULL)) -+ { -+ *(str2 - 1) = '\0'; -+ } -+ -+ /* -+ * Old URI with "serial=?". Cut this part off and consider this as -+ * an URI without serial number -+ */ -+ if ((str1 = strstr(requested_uri, "serial=?")) != NULL) -+ *(str1 - 1) = '\0'; -+ -+ /* -+ * Old URI without serial number. Match it also with URIs with serial -+ * number -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && -+ ((str2 = strstr(device_uri, "serial=")) != NULL)) -+ *(str2 - 1) = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have a "serial" specification when the -+ * usblp-discovered URI for the same printer does not have one, as -+ * with libusb we can discover serial numbers also with other methods -+ * than only via the device ID. Therefore we accept also a -+ * usblp-discovered printer without serial number as a match. This we -+ * do by removing the serial number from the queue's (libusb-discovered) -+ * URI before comparing. Also warn the user because of the incapability -+ * of the usblp-based access to distinguish printers by the serial -+ * number. -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && -+ ((str2 = strstr(device_uri, "serial=")) != NULL)) -+ { -+ *(str2 - 1) = '\0'; -+ if (backendGetMakeModel(device_id, buf, sizeof(buf)) == 0) -+ fprintf(stderr, "WARNING: If you have more than one %s printer connected to this machine, please make sure that the \"usblp\" kernel module is always unloaded (and blacklisted) and re-create the queues for these printers. Otherwise CUPS will not be able to distinguish them.\n", -+ buf); -+ } -+ -+ return (!strcmp(requested_uri, device_uri)); - } - - - /* -- * 'side_cb()' - Handle side-channel requests. -+ * 'side_cb_libusb()' - Handle side-channel requests. - */ - - static ssize_t /* O - Number of bytes written */ --side_cb(usb_printer_t *printer, /* I - Printer */ -+side_cb_libusb(usb_printer_t *printer, /* I - Printer */ - int print_fd) /* I - File to print */ - { - ssize_t bytes, /* Bytes read/written */ -diff -urNad cups-1.4.3~/backend/usb-unix.c cups-1.4.3/backend/usb-unix.c ---- cups-1.4.3~/backend/usb-unix.c 2009-12-08 03:13:42.000000000 +0100 -+++ cups-1.4.3/backend/usb-unix.c 2010-04-09 15:56:30.799666933 +0200 -@@ -18,10 +18,10 @@ - * - * Contents: - * -- * print_device() - Print a file to a USB device. -- * list_devices() - List all USB devices. -- * open_device() - Open a USB device... -- * side_cb() - Handle side-channel requests... -+ * print_device_unix() - Print a file to a USB device. -+ * list_devices_unix() - List all USB devices. -+ * open_device_unix() - Open a USB device... -+ * side_cb_unix() - Handle side-channel requests... - */ - - /* -@@ -35,17 +35,17 @@ - * Local functions... - */ - --static int open_device(const char *uri, int *use_bc); --static int side_cb(int print_fd, int device_fd, int snmp_fd, -+static int open_device_unix(const char *uri, int *use_bc); -+static int side_cb_unix(int print_fd, int device_fd, int snmp_fd, - http_addr_t *addr, int use_bc); - - - /* -- * 'print_device()' - Print a file to a USB device. -+ * 'print_device_unix()' - Print a file to a USB device. - */ - - int /* O - Exit status */ --print_device(const char *uri, /* I - Device URI */ -+print_device_unix(const char *uri, /* I - Device URI */ - const char *hostname, /* I - Hostname/manufacturer */ - const char *resource, /* I - Resource/modelname */ - char *options, /* I - Device options/serial number */ -@@ -102,7 +102,7 @@ - strncasecmp(hostname, "Minolta", 7); - #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ - -- if ((device_fd = open_device(uri, &use_bc)) == -1) -+ if ((device_fd = open_device_unix(uri, &use_bc)) == -1) - { - if (getenv("CLASS") != NULL) - { -@@ -132,6 +132,10 @@ - _("INFO: Printer busy; will retry in 10 seconds...\n")); - sleep(10); - } -+#ifdef HAVE_USB_H -+ else -+ return (-1); -+#else - else if (errno == ENXIO || errno == EIO || errno == ENOENT || - errno == ENODEV) - { -@@ -147,6 +151,7 @@ - resource, strerror(errno)); - return (CUPS_BACKEND_FAILED); - } -+#endif - } - } - while (device_fd < 0); -@@ -190,7 +195,7 @@ - tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL); - - #else -- tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb); -+ tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb_unix); - #endif /* __sun */ - - if (print_fd != 0 && tbytes >= 0) -@@ -214,11 +219,11 @@ - - - /* -- * 'list_devices()' - List all USB devices. -+ * 'list_devices_unix()' - List all USB devices. - */ - - void --list_devices(void) -+list_devices_unix(void) - { - #ifdef __linux - int i; /* Looping var */ -@@ -320,11 +325,11 @@ - - - /* -- * 'open_device()' - Open a USB device... -+ * 'open_device_unix()' - Open a USB device... - */ - - static int /* O - File descriptor or -1 on error */ --open_device(const char *uri, /* I - Device URI */ -+open_device_unix(const char *uri, /* I - Device URI */ - int *use_bc) /* O - Set to 0 for unidirectional */ - { - int fd; /* File descriptor */ -@@ -357,9 +362,12 @@ - char device[255], /* Device filename */ - device_id[1024], /* Device ID string */ - make_model[1024], /* Make and model */ -- device_uri[1024]; /* Device URI string */ -- -+ device_uri[1024], /* Device URI string */ -+ requested_uri[1024], /* Device URI string */ -+ *str1, -+ *str2; - -+ - /* - * Find the correct USB device... - */ -@@ -407,7 +415,55 @@ - device_uri[0] = '\0'; - } - -- if (!strcmp(uri, device_uri)) -+ /* Work on a copy of uri */ -+ strncpy(requested_uri, uri, sizeof(requested_uri)); -+ requested_uri[sizeof(requested_uri) - 1] = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have an "interface" specification and this -+ * never happens for usblp-discovered URIs, so remove the "interface" -+ * specification from the URI of the print queue. This way a queue for -+ * a libusb-discovered printer can now be accessed via the usblip kernel -+ * module -+ */ -+ if ((str1 = strstr(requested_uri, "interface=")) != NULL) -+ *(str1 - 1) = '\0'; -+ -+ /* -+ * Old URI with "serial=?". Cut this part off and consider this as -+ * an URI without serial number -+ */ -+ if ((str1 = strstr(requested_uri, "serial=?")) != NULL) -+ *(str1 - 1) = '\0'; -+ -+ /* -+ * Old URI without serial number. Match it also with URIs with serial -+ * number -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && -+ ((str2 = strstr(device_uri, "serial=")) != NULL)) -+ *(str2 - 1) = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have a "serial" specification when the -+ * usblp-discovered URI for the same printer does not have one, as -+ * with libusb we can discover serial numbers also with other methods -+ * than only via the device ID. Therefore we accept also a -+ * usblp-discovered printer without serial number as a match. This we -+ * do by removing the serial number from the queue's (libusb-discovered) -+ * URI before comparing. Also warn the user because of the incapability -+ * of the usblp-based access to distinguish printers by the serial -+ * number. -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) != NULL) && -+ ((str2 = strstr(device_uri, "serial=")) == NULL)) -+ { -+ *(str1 - 1) = '\0'; -+ fprintf(stderr, "WARNING: If you have more than one %s printer connected to this machine, please unload (and blacklist) the \"usblp\" kernel module as otherwise CUPS will not be able to distinguish your printers.\n", -+ make_model); -+ } -+ -+ if (!strcmp(requested_uri, device_uri)) - { - /* - * Yes, return this file descriptor... -@@ -433,10 +489,14 @@ - */ - - if (busy) -+ { - _cupsLangPuts(stderr, - _("INFO: Printer busy; will retry in 5 seconds...\n")); - -- sleep(5); -+ sleep(5); -+ } -+ else -+ return -1; - } - } - #elif defined(__sun) && defined(ECPPIOC_GETDEVID) -@@ -557,11 +617,11 @@ - - - /* -- * 'side_cb()' - Handle side-channel requests... -+ * 'side_cb_unix()' - Handle side-channel requests... - */ - - static int /* O - 0 on success, -1 on error */ --side_cb(int print_fd, /* I - Print file */ -+side_cb_unix(int print_fd, /* I - Print file */ - int device_fd, /* I - Device file */ - int snmp_fd, /* I - SNMP socket (unused) */ - http_addr_t *addr, /* I - Device address (unused) */ -diff -urNad cups-1.4.3~/backend/usb.c cups-1.4.3/backend/usb.c ---- cups-1.4.3~/backend/usb.c 2008-06-24 03:28:36.000000000 +0200 -+++ cups-1.4.3/backend/usb.c 2010-04-09 15:56:04.345707078 +0200 -@@ -56,7 +56,7 @@ - */ - - #ifdef HAVE_USB_H --# include "usb-libusb.c" -+# include "usb-hybrid.c" - #elif defined(__APPLE__) - # include "usb-darwin.c" - #elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) diff --git a/cups/usb-backend-gracefully-fail-on-more-cases-of-bad-device-id.patch b/cups/usb-backend-gracefully-fail-on-more-cases-of-bad-device-id.patch new file mode 100644 index 0000000..019a230 --- /dev/null +++ b/cups/usb-backend-gracefully-fail-on-more-cases-of-bad-device-id.patch @@ -0,0 +1,32 @@ +# http://www.cups.org/str.php?L3978 + +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -430,15 +430,26 @@ + * Check to see if the length is larger than our buffer; first + * assume that the vendor incorrectly implemented the 1284 spec, + * and then limit the length to the size of our buffer... ++ * Consider a length < 14 as too short, as the minimum valid device ++ * ID ("MFG:x;MDL:y;") is 12 bytes long and so we have at least 14 ++ * bytes with the two length bytes... ++ * Especially the length in the memmove() call cannot get negative then, ++ * causing the backend to segfault. + */ + +- if (length > bufsize) ++ if ((length > bufsize) || (length < 14)) + length = (((unsigned)buffer[1] & 255) << 8) + + ((unsigned)buffer[0] & 255); + + if (length > bufsize) + length = bufsize; + ++ if (length < 14) ++ { ++ *buffer = '\0'; ++ return (-1); ++ } ++ + length -= 2; + + /* diff --git a/cups/usb-skip-interface-altsetting.patch b/cups/usb-skip-interface-altsetting.patch new file mode 100644 index 0000000..cb72c15 --- /dev/null +++ b/cups/usb-skip-interface-altsetting.patch @@ -0,0 +1,105 @@ +# http://www.cups.org/str.php?L3965 + +Index: usb-libusb.c +=================================================================== +--- usb-libusb.c (revision 10087) ++++ usb-libusb.c (working copy) +@@ -631,6 +631,7 @@ + int verbose) /* I - Update connecting-to-device state? */ + { + int number; /* Configuration/interface/altset numbers */ ++ char current_bConfiguration; + + + /* +@@ -647,27 +648,40 @@ + if ((printer->handle = usb_open(printer->device)) == NULL) + return (-1); + +- /* +- * Then set the desired configuration... +- */ + + if (verbose) + fputs("STATE: +connecting-to-device\n", stderr); + ++ /* ++ * Set the desired configuration, but only if it needs changing. Some ++ * printers (e.g., Samsung) don't like usb_set_configuration. It will succeed, ++ * but the following print job is sometimes silently lost by the printer. ++ */ ++ if (usb_control_msg(printer->handle, ++ USB_TYPE_STANDARD | USB_ENDPOINT_IN | USB_RECIP_DEVICE, ++ 8, /* GET_CONFIGURATION */ ++ 0, 0, &current_bConfiguration, 1, 5000) != 1) ++ { ++ current_bConfiguration = 0; /* Failed. Assume not configured */ ++ } ++ + number = printer->device->config[printer->conf].bConfigurationValue; +- +- if (usb_set_configuration(printer->handle, number) < 0) ++ if (number != current_bConfiguration) + { +- /* +- * If the set fails, chances are that the printer only supports a +- * single configuration. Technically these printers don't conform to +- * the USB printer specification, but otherwise they'll work... +- */ + +- if (errno != EBUSY) +- fprintf(stderr, "DEBUG: Failed to set configuration %d for %04x:%04x\n", +- number, printer->device->descriptor.idVendor, +- printer->device->descriptor.idProduct); ++ if (usb_set_configuration(printer->handle, number) < 0) ++ { ++ /* ++ * If the set fails, chances are that the printer only supports a ++ * single configuration. Technically these printers don't conform to ++ * the USB printer specification, but otherwise they'll work... ++ */ ++ ++ if (errno != EBUSY) ++ fprintf(stderr, "DEBUG: Failed to set configuration %d for %04x:%04x\n", ++ number, printer->device->descriptor.idVendor, ++ printer->device->descriptor.idProduct); ++ } + } + + /* +@@ -700,20 +714,24 @@ + #endif /* 0 */ + + /* +- * Set alternate setting... ++ * Set alternate setting, but only if there is more than one option. ++ * Some printers (e.g., Samsung) don't like usb_set_altinterface. + */ +- +- number = printer->device->config[printer->conf].interface[printer->iface]. +- altsetting[printer->altset].bAlternateSetting; +- while (usb_set_altinterface(printer->handle, number) < 0) ++ if (printer->device->config[printer->conf].interface[printer->iface]. ++ num_altsetting > 1) + { +- if (errno != EBUSY) +- fprintf(stderr, +- "DEBUG: Failed to set alternate interface %d for %04x:%04x: %s\n", +- number, printer->device->descriptor.idVendor, +- printer->device->descriptor.idProduct, strerror(errno)); ++ number = printer->device->config[printer->conf].interface[printer->iface]. ++ altsetting[printer->altset].bAlternateSetting; ++ while (usb_set_altinterface(printer->handle, number) < 0) ++ { ++ if (errno != EBUSY) ++ fprintf(stderr, ++ "DEBUG: Failed to set alternate interface %d for %04x:%04x: %s\n", ++ number, printer->device->descriptor.idVendor, ++ printer->device->descriptor.idProduct, strerror(errno)); + +- goto error; ++ goto error; ++ } + } + + if (verbose)

1 0