Hello community, here is the log from the commit of package xpp checked in at Mon Nov 27 18:34:36 CET 2006. -------- --- xpp/xpp.changes 2006-01-25 21:43:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/xpp/xpp.changes 2006-11-27 14:33:04.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 27 14:32:49 CET 2006 - kssingvo@suse.de + +- fixed issue with unix domain socket (bugzilla#223706) + +------------------------------------------------------------------- New: ---- xpp-1.5-domain_socket.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpp.spec ++++++ --- /var/tmp/diff_new_pack.q4Vx67/_old 2006-11-27 18:34:07.000000000 +0100 +++ /var/tmp/diff_new_pack.q4Vx67/_new 2006-11-27 18:34:07.000000000 +0100 @@ -5,21 +5,22 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: xpp BuildRequires: cups cups-devel fltk-devel freeglut-devel gcc-c++ libdrm-devel libjpeg-devel libpng-devel openssl-devel xorg-x11 -License: GPL +License: GNU General Public License (GPL) Group: Hardware/Printing Summary: CUPS X Window System front-end URL: http://cups.sourceforge.net/xpp/ Version: 1.5 -Release: 8 +Release: 46 Source0: http://download.sourceforge.net/cups/%{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}.patch +Patch1: %{name}-1.5-domain_socket.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: fltk >= 1.0.11, cups >= 1.1.9 @@ -37,6 +38,7 @@ %prep %setup -n xpp-%{version} %patch0 -p1 +%patch1 -p1 %build %{?suse_update_config:%{suse_update_config -f . }} @@ -54,6 +56,8 @@ /usr/bin/xpp %changelog -n xpp +* Mon Nov 27 2006 - kssingvo@suse.de +- fixed issue with unix domain socket (bugzilla#223706) * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Sat Jan 14 2006 - schwab@suse.de ++++++ xpp-1.5-domain_socket.patch ++++++ --- xpp-1.5/cupshelper.cxx.orig 2002-05-28 17:49:45.000000000 +0200 +++ xpp-1.5/cupshelper.cxx 2006-11-27 14:25:24.000000000 +0100 @@ -152,7 +152,10 @@ int value(-1); request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES; - sprintf(str,"ipp://%s:%d/printers/%s",host(),port(),name); + if (host()[0] == '/') // unix domain socket + sprintf(str,"ipp://localhost:%d/printers/%s",port(),name); + else + sprintf(str,"ipp://%s:%d/printers/%s",host(),port(),name); ippAddString(request,IPP_TAG_OPERATION,IPP_TAG_URI,"printer-uri",NULL,str); //sprintf(str,"/printers/%s",name); sprintf(str,"/printers/"); --- xpp-1.5/xpp.cxx.orig 2006-11-27 14:23:40.000000000 +0100 +++ xpp-1.5/xpp.cxx 2006-11-27 14:29:52.000000000 +0100 @@ -288,8 +288,12 @@ ipp_t *request = CupsHelper::newIppRequest(); char buf[1024], *state, *type, *location, *comment; - sprintf(buf,"ipp://%s:%d/printers/%s",CupsHelper::host(), - CupsHelper::port(),dests[i].name); + if (CupsHelper::host()[0] == '/') // unix domain socket + sprintf(buf,"ipp://localhost:%d/printers/%s",CupsHelper::port(), + dests[i].name); + else + sprintf(buf,"ipp://%s:%d/printers/%s",CupsHelper::host(), + CupsHelper::port(),dests[i].name); ippAddString(request,IPP_TAG_OPERATION,IPP_TAG_URI,"printer-uri",NULL,buf); request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES; request = CupsHelper::processRequest(request,"/printers/"); @@ -716,8 +720,12 @@ ipp_t *request = CupsHelper::newIppRequest(); char buffer[1024], *t; const char *s, *u; - sprintf(buffer,"ipp://%s:%d/printers/%s",CupsHelper::host(), - CupsHelper::port(),dests[dest_pos].name); + if (CupsHelper::host()[0] == '/') + sprintf(buffer,"ipp://localhost:%d/printers/%s", CupsHelper::port(), + dests[dest_pos].name); + else + sprintf(buffer,"ipp://%s:%d/printers/%s",CupsHelper::host(), + CupsHelper::port(),dests[dest_pos].name); ippAddString(request,IPP_TAG_OPERATION,IPP_TAG_URI, "printer-uri",NULL,buffer); request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES; @@ -791,8 +799,12 @@ ipp_t *request = CupsHelper::newIppRequest(); char buffer[1024]; const char *s, *t, *u; - sprintf(buffer,"ipp://%s:%d/printers/%s",CupsHelper::host(), - CupsHelper::port(),dests[dest_pos].name); + if (CupsHelper::host()[0] == '/') // unix domain socket + sprintf(buffer,"ipp://localhost:%d/printers/%s",CupsHelper::port(), + dests[dest_pos].name); + else + sprintf(buffer,"ipp://%s:%d/printers/%s",CupsHelper::host(), + CupsHelper::port(),dests[dest_pos].name); ippAddString(request,IPP_TAG_OPERATION,IPP_TAG_URI, "printer-uri",NULL,buffer); request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org