November 2009 - openSUSE Commits - openSUSE Mailing Lists

commit xalan-c for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package xalan-c for openSUSE:Factory checked in at Fri Nov 27 16:10:52 CET 2009. -------- --- xalan-c/xalan-c.changes 2009-08-26 14:18:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/xalan-c/xalan-c.changes 2009-11-15 14:37:09.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 15 14:36:55 CET 2009 - meissner(a)suse.de + +- refresh patch with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xalan-c.spec ++++++ --- /var/tmp/diff_new_pack.bCBdD3/_old 2009-11-27 16:09:07.000000000 +0100 +++ /var/tmp/diff_new_pack.bCBdD3/_new 2009-11-27 16:09:07.000000000 +0100 @@ -24,7 +24,7 @@ Group: Productivity/Publishing/XML AutoReqProv: on Version: 1.10.0 -Release: 3 +Release: 4 %define tarver 1_10_0 Summary: An XSLT Transformation Engine in C++ Url: http://xml.apache.org/xalan-c/ ++++++ xalan-c-1.10.0-lib64.patch ++++++ --- /var/tmp/diff_new_pack.bCBdD3/_old 2009-11-27 16:09:07.000000000 +0100 +++ /var/tmp/diff_new_pack.bCBdD3/_new 2009-11-27 16:09:07.000000000 +0100 @@ -1,6 +1,8 @@ ---- c/Makefile.incl.in +Index: c/Makefile.incl.in +=================================================================== +--- c/Makefile.incl.in.orig +++ c/Makefile.incl.in -@@ -70,7 +70,7 @@ +@@ -72,7 +72,7 @@ ifdef XALAN_USE_ICU endif # required libraries @@ -9,9 +11,11 @@ ICU_LIB = -L$(ICUROOT)/lib -licuuc -L$(ICUI18NROOT)/lib -licui18n XALAN_LIB = $(LIBRARY_SEARCH_PATH) $(LIBRARY_LINK_NAME) ---- c/src/xalanc/Makefile.in +Index: c/src/xalanc/Makefile.in +=================================================================== +--- c/src/xalanc/Makefile.in.orig +++ c/src/xalanc/Makefile.in -@@ -134,8 +134,8 @@ +@@ -136,8 +136,8 @@ ifdef XALAN_USE_ICU XSL_INCL += -I${ICUROOT}/include XSL_BUILD_OPTIONS += -DXALAN_USE_ICU @@ -22,7 +26,7 @@ ICU_LIBI18N_LINK_NAME=libicui18n$(SHLIBSUFFIX) endif -@@ -264,7 +264,7 @@ +@@ -266,7 +266,7 @@ endif ## OS390 2> /dev/null; \ done ifdef XALAN_USE_ICU @@ -30,4 +34,4 @@ + $(INSTALL_PROGRAM) $(ICULIB_LOC)/$(ICU_LIBI18N_LIB) \ $(DESTDIR)/$(libdir) ifneq ($PLATFORM), OS390) - rm -f $(DESTIDR)/$(libdir)/$(ICU_LIBI18N_LINK_NAME) && \ + rm -f $(DESTDIR)/$(libdir)/$(ICU_LIBI18N_LINK_NAME) && \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xgrabsc for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package xgrabsc for openSUSE:Factory checked in at Fri Nov 27 16:08:46 CET 2009. -------- --- xgrabsc/xgrabsc.changes 2008-08-22 15:36:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/xgrabsc/xgrabsc.changes 2009-11-27 09:11:41.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Nov 27 09:09:21 UTC 2009 - mseben(a)novell.com + +- Update patches to apply with fuzz=0 + +------------------------------------------------------------------- +Thu Oct 15 22:24:22 CEST 2009 - marek.belisko(a)open-nandra.com + +- Fixed memory leak (bnc #542498) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xgrabsc-2.41-memoryleak.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgrabsc.spec ++++++ --- /var/tmp/diff_new_pack.KcaKfq/_old 2009-11-27 16:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.KcaKfq/_new 2009-11-27 16:08:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xgrabsc (Version 2.41) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,11 @@ Name: xgrabsc Url: ftp://ftp.x.org/contrib/applications/ BuildRequires: libgcc libstdc++ ncurses-devel openmotif openmotif-devel update-desktop-files xorg-x11 -License: Any permissive; X11/MIT +License: PERMISSIVE-OSI-COMPLIANT ; MIT Group: System/X11/Utilities AutoReqProv: on Version: 2.41 -Release: 1225 +Release: 1238 Summary: A Screen Grabber for the X Window System. Source: xgrabsc-%{version}.tar.bz2 Source1: xgrabsc.desktop @@ -34,6 +34,8 @@ Patch2: xgrabsc-%{version}-implicit_decl.patch Patch3: xgrabsc-%{version}-no_xrdb.patch Patch4: xgrabsc-%{version}-new_ncurses.patch +# PATCH-FIX-OPENSUSE xgrabsc-2.41-memoryleak.patch bnc#542498 +Patch5: xgrabsc-%{version}-memoryleak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%(xft-config --prefix)" == "/usr" %define _xorg7libs %_lib @@ -93,6 +95,7 @@ %if %suse_version > 1100 %patch4 %endif +%patch5 %build xmkmf ++++++ xgrabsc-2.41-gcc4.patch ++++++ --- /var/tmp/diff_new_pack.KcaKfq/_old 2009-11-27 16:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.KcaKfq/_new 2009-11-27 16:08:11.000000000 +0100 @@ -1,6 +1,7 @@ -diff -ur xgrabsc-orig/convert.c xgrabsc-2.41/convert.c ---- xgrabsc-orig/convert.c 1995-11-07 20:31:40.000000000 +0100 -+++ xgrabsc-2.41/convert.c 2005-04-29 13:01:16.398051398 +0200 +Index: xgrabsc-2.41/convert.c +=================================================================== +--- xgrabsc-2.41.orig/convert.c ++++ xgrabsc-2.41/convert.c @@ -22,8 +22,7 @@ /* * convert a pixmap image into a bitmap image @@ -11,7 +12,7 @@ { XImage *ximage = image->ximage; int x, y; -@@ -139,9 +138,7 @@ +@@ -140,9 +139,7 @@ static byte DitherBits[GRAYS][4] = { /* halftone or dither a color image, changing it into a monochrome * image */ @@ -22,10 +23,11 @@ { XImage *ximage = image->ximage; XImage *newImage; -diff -ur xgrabsc-orig/process.c xgrabsc-2.41/process.c ---- xgrabsc-orig/process.c 1995-11-07 20:31:40.000000000 +0100 -+++ xgrabsc-2.41/process.c 2005-04-29 12:58:08.415304537 +0200 -@@ -229,8 +229,7 @@ +Index: xgrabsc-2.41/process.c +=================================================================== +--- xgrabsc-2.41.orig/process.c ++++ xgrabsc-2.41/process.c +@@ -230,8 +230,7 @@ reverseColors(image) * Compress the colors used in an XImage so that all pixel values are * adjacent. Alters the rgb color tables and the XImage data values. */ @@ -35,9 +37,10 @@ { XImage *ximage = image->ximage; long map[MAX_CELLS]; -diff -ur xgrabsc-orig/write.c xgrabsc-2.41/write.c ---- xgrabsc-orig/write.c 1995-11-07 20:31:40.000000000 +0100 -+++ xgrabsc-2.41/write.c 2005-04-29 13:11:02.122000239 +0200 +Index: xgrabsc-2.41/write.c +=================================================================== +--- xgrabsc-2.41.orig/write.c ++++ xgrabsc-2.41/write.c @@ -21,8 +21,7 @@ @@ -48,7 +51,7 @@ { byte b2; -@@ -124,9 +123,7 @@ +@@ -128,9 +127,7 @@ writeint(intValue, outfile) } @@ -59,7 +62,7 @@ { dw width, height, hasColormap, colormapSize; int i, w, h; -@@ -1165,9 +1162,7 @@ +@@ -1210,9 +1207,7 @@ writeColorPS(image, outfile, encode, enc * Write an image in 'puzzle' format, suitable for loading with * "puzzle -picture". */ @@ -70,7 +73,7 @@ { XImage *ximage = image->ximage; int nc, width, height, w, h, cidx; -@@ -1207,10 +1202,7 @@ +@@ -1253,10 +1248,7 @@ writePuzzle(image, outfile) @@ -82,7 +85,7 @@ { XImage *ximage = image->ximage; XWDFileHeader header; -@@ -1327,9 +1319,7 @@ +@@ -1374,9 +1366,7 @@ writeXWD(image, outfile, xyformat) * use it. */ @@ -93,7 +96,7 @@ { XImage *ximage = image->ximage; int w, h; -@@ -1384,9 +1374,7 @@ +@@ -1432,9 +1422,7 @@ writeXYPixmap(image, outfile) * Write a color image out in Pixmap format. * Supported output formats are xpm1 (original xpm), xpm2 and xpm3 */ @@ -104,7 +107,7 @@ { XImage *ximage = image->ximage; int nc, width, height, w, h, cidx, cpp; -@@ -1483,9 +1471,7 @@ +@@ -1597,9 +1585,7 @@ fprintf(outfile, "/* pixels */\n"); /* * Write a color image out in PPM, a portable bitmap format. */ ++++++ xgrabsc-2.41-implicit_decl.patch ++++++ --- /var/tmp/diff_new_pack.KcaKfq/_old 2009-11-27 16:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.KcaKfq/_new 2009-11-27 16:08:11.000000000 +0100 @@ -1,6 +1,8 @@ ---- xgrabsc.c +Index: xgrabsc.c +=================================================================== +--- xgrabsc.c.orig +++ xgrabsc.c -@@ -34,8 +34,10 @@ +@@ -34,6 +34,8 @@ */ #include "xgrabsc.h" @@ -9,9 +11,7 @@ - /* versions of XmuGetClientWindow and screenNumberOfScreen. - * GetClientWindow is used so Xmu need not be linked (causes problems on -@@ -626,7 +629,7 @@ +@@ -626,7 +628,7 @@ xgrabsc(argc, argv, env) case sourceKey: childWindow = #ifdef SELECTION_MASK @@ -20,7 +20,9 @@ #else getWindowWhenKeyIsPressed(ControlMask); #endif ---- xgrabxaw.c +Index: xgrabxaw.c +=================================================================== +--- xgrabxaw.c.orig +++ xgrabxaw.c @@ -23,6 +23,7 @@ #include "config.h" @@ -30,7 +32,9 @@ #include <ctype.h> #include <X11/Intrinsic.h> #include <X11/StringDefs.h> ---- xgrabxm.c +Index: xgrabxm.c +=================================================================== +--- xgrabxm.c.orig +++ xgrabxm.c @@ -22,6 +22,7 @@ #include "config.h" ++++++ xgrabsc-2.41-memoryleak.patch ++++++ Index: write.c =================================================================== --- write.c.orig +++ write.c @@ -1575,8 +1575,11 @@ fprintf(outfile, "/* pixels */\n"); /* write end */ fputs("};\n", outfile); + free(pix_red); + free(pix_green); + free(pix_blue); - return 0; + return 0; } ++++++ xgrabsc-2.41-new_ncurses.patch ++++++ --- /var/tmp/diff_new_pack.KcaKfq/_old 2009-11-27 16:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.KcaKfq/_new 2009-11-27 16:08:11.000000000 +0100 @@ -1,4 +1,6 @@ ---- xgrabsc.c +Index: xgrabsc.c +=================================================================== +--- xgrabsc.c.orig +++ xgrabsc.c @@ -35,7 +35,7 @@ ++++++ xgrabsc-2.41-no_xrdb.patch ++++++ --- /var/tmp/diff_new_pack.KcaKfq/_old 2009-11-27 16:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.KcaKfq/_new 2009-11-27 16:08:11.000000000 +0100 @@ -1,6 +1,8 @@ ---- Imakefile +Index: Imakefile +=================================================================== +--- Imakefile.orig +++ Imakefile -@@ -78,7 +78,7 @@ +@@ -78,7 +78,7 @@ XGrab.ad: ADName ADName: ADSource rm -f ADName ++++++ xgrabsc-2.41.patch ++++++ --- /var/tmp/diff_new_pack.KcaKfq/_old 2009-11-27 16:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.KcaKfq/_new 2009-11-27 16:08:11.000000000 +0100 @@ -1,6 +1,8 @@ ---- XGrabxm.res +Index: XGrabxm.res +=================================================================== +--- XGrabxm.res.orig +++ XGrabxm.res -@@ -22,8 +22,8 @@ +@@ -22,8 +22,8 @@ XGrab*.selectiontype.numColumns: 1 XGrab*.selectiontype.x: 5 XGrab*.click.labelString: Click @@ -10,7 +12,7 @@ XGrab*.key.labelString: Ctrl key XGrab*.root.labelString: Everything! -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ XGrab*.xwd.labelString: X Window Dump XGrab*.ps.labelString: PostScript XGrab*.xpm3.labelString: XPM3 XGrab*.ppm.labelString: PPM @@ -19,7 +21,9 @@ XGrab*.puzzle.labelString: Puzzle XGrab*.xwdxy.labelString: XWD-xy XGrab*.xpm.labelString: XPM1 ---- config.h +Index: config.h +=================================================================== +--- config.h.orig +++ config.h @@ -75,11 +75,17 @@ * The inset sizes control the maximum size of the image on the page. @@ -52,9 +56,11 @@ #define DEFAULT_COMMAND lpr #define DEFAULT_PRESLEEP 3 #define DEFAULT_POSTSLEEP 0 ---- convert.c +Index: convert.c +=================================================================== +--- convert.c.orig +++ convert.c -@@ -105,6 +105,7 @@ +@@ -105,6 +105,7 @@ pixmap2bitmap(image) image->used[whitep] = 1; image->used[blackp] = 1; image->numcells = 2; @@ -62,25 +68,22 @@ } -@@ -331,5 +332,6 @@ +@@ -331,5 +332,6 @@ pixmap2halftone(image, dither) image->used[whitep] = 1; image->used[blackp] = 1; image->numcells = 2; + return 0; } ---- get.c +Index: get.c +=================================================================== +--- get.c.orig +++ get.c -@@ -80,35 +80,40 @@ +@@ -80,35 +80,40 @@ getImage(xrect, image, window) XCloseDisplay(hDisplay); exit(3); } -+ -+ if (depth <= 8) { -+ /* this won't cut the mustard for DirectColor */ -+ for (i=0; i<ncolors; i++) -+ colors[i].pixel = i; - +- - /* this won't cut the mustard for DirectColor */ - for (i=0; i<ncolors; i++) - colors[i].pixel = i; @@ -91,7 +94,7 @@ - image->green[i] = colors[i].green; - image->blue[i] = colors[i].blue; - } -- + - /* figure out which colormap entries are actually used by the image */ - ncolors = cmapSize = 0; - memset((char *)image->used, 0, MAX_CELLS); @@ -104,6 +107,11 @@ - cmapSize = i+1; - ncolors++; - } ++ if (depth <= 8) { ++ /* this won't cut the mustard for DirectColor */ ++ for (i=0; i<ncolors; i++) ++ colors[i].pixel = i; ++ + XQueryColors(hDisplay, cmap, colors, ncolors); + for (i=0; i<ncolors; i++) { + image->red[i] = colors[i].red; @@ -139,9 +147,11 @@ return TRUE; } ---- process.c +Index: process.c +=================================================================== +--- process.c.orig +++ process.c -@@ -219,6 +219,7 @@ +@@ -219,6 +219,7 @@ reverseColors(image) image->green[cidx] = (unsigned short)0xFFFF & (unsigned short)~((unsigned short)(image->green[cidx])); } } @@ -149,7 +159,7 @@ } -@@ -237,6 +238,10 @@ +@@ -237,6 +238,10 @@ compressColormap(image) int ncolors, w, h, m; long p; @@ -160,9 +170,11 @@ if (ximage->depth <= 1 || image->numcells > MAX_CELLS) return; ---- write.c +Index: write.c +=================================================================== +--- write.c.orig +++ write.c -@@ -59,6 +59,7 @@ +@@ -59,6 +59,7 @@ swapbytes(pDblw) cnv.bytes[1] = cnv.bytes[2]; cnv.bytes[2] = aByte; *pDblw = cnv.dbl; @@ -170,7 +182,7 @@ } -@@ -83,6 +84,7 @@ +@@ -83,6 +84,7 @@ swapdws (bp, n) *bp++ = c; bp += 2; } @@ -178,7 +190,7 @@ } -@@ -101,6 +103,7 @@ +@@ -101,6 +103,7 @@ swapwords (bp, n) bp++; *bp++ = c; } @@ -186,7 +198,7 @@ } -@@ -121,6 +124,7 @@ +@@ -121,6 +124,7 @@ writeint(intValue, outfile) swapbytes(&intValue); fwrite(&(intValue), 4, 1, (outfile)); #endif @@ -194,7 +206,7 @@ } -@@ -159,6 +163,7 @@ +@@ -159,6 +163,7 @@ writeSimple(image, outfile) for (h=0; h<image->ximage->height; h++) for (w=0; w<image->ximage->width; w++) fputc(XGetPixel(image->ximage, w, h), outfile); @@ -202,7 +214,7 @@ } -@@ -184,6 +189,8 @@ +@@ -184,6 +189,8 @@ XImage* makePSImage(image, desiredDepth, int lshift, lmask; long p; int x, y, i; @@ -211,7 +223,7 @@ XImage* ximage = image->ximage; XImage* psimage; -@@ -230,10 +237,40 @@ +@@ -230,10 +237,40 @@ XImage* makePSImage(image, desiredDepth, for (y = 0; y < ximage->height; y++) { for (x = 0; x < ximage->width; x++) { p = XGetPixel(ximage, x, y); @@ -256,7 +268,7 @@ XPutPixel(psimage, x, y, i); } } -@@ -269,6 +306,7 @@ +@@ -269,6 +306,7 @@ writeOnlyPreview(image, outfile) free(psimage->data); free(psimage); } @@ -264,7 +276,7 @@ } -@@ -295,6 +333,7 @@ +@@ -295,6 +333,7 @@ copyImage(image, newImage) XCloseDisplay(hDisplay); exit(3); } @@ -272,7 +284,7 @@ } -@@ -381,6 +420,7 @@ +@@ -381,6 +420,7 @@ writePreview(image, outfile, defaultImag if (newImage.ximage) { XDestroyImage(newImage.ximage); } @@ -280,7 +292,7 @@ } -@@ -715,6 +755,7 @@ +@@ -715,6 +755,7 @@ writePostscript(image, outfile, encode, free(newImage->ximage); free(newImage); } @@ -288,7 +300,7 @@ } -@@ -741,6 +782,7 @@ +@@ -741,6 +782,7 @@ writeColorPS(image, outfile, encode, enc double xdpi, ydpi, xscale, yscale, f; double left, top; int depth, bpl, spb; @@ -296,7 +308,7 @@ long p; /* rle variables */ int rlecount; -@@ -1047,15 +1089,17 @@ +@@ -1047,15 +1089,17 @@ writeColorPS(image, outfile, encode, enc } @@ -318,7 +330,7 @@ fputs("pop pop\n\n", outfile); -@@ -1148,6 +1192,7 @@ +@@ -1148,6 +1192,7 @@ writeColorPS(image, outfile, encode, enc #if defined(TRAILING_EOD) fputc('\004', outfile); #endif @@ -326,7 +338,7 @@ } -@@ -1199,6 +1244,7 @@ +@@ -1199,6 +1244,7 @@ writePuzzle(image, outfile) /* this won't work if depth > 8 */ for (w=0; w<ximage->width; w++) fputc(XGetPixel(ximage, w, h), outfile); @@ -334,7 +346,7 @@ } -@@ -1315,6 +1361,7 @@ +@@ -1315,6 +1361,7 @@ writeXWD(image, outfile, xyformat) else fwrite(ximage->data, ximage->height * ximage->bytes_per_line, 1, outfile); } @@ -342,7 +354,7 @@ } -@@ -1371,6 +1418,7 @@ +@@ -1371,6 +1418,7 @@ writeXYPixmap(image, outfile) } } fputs(" };\n", outfile); @@ -350,7 +362,7 @@ } -@@ -1390,91 +1438,157 @@ +@@ -1390,91 +1438,157 @@ writeZPixmap(xpmFormat, image, outfile) { XImage *ximage = image->ximage; int nc, width, height, w, h, cidx, cpp; @@ -587,7 +599,7 @@ } -@@ -1499,21 +1613,77 @@ +@@ -1499,21 +1613,77 @@ writePPM(image, outfile) nc = image->numcells; time(&p); fprintf(outfile, "P3\n# PPM output created by xgrabsc on %s", ctime(&p)); @@ -677,16 +689,20 @@ } + return 0; } ---- xgrabsc.c +Index: xgrabsc.c +=================================================================== +--- xgrabsc.c.orig +++ xgrabsc.c -@@ -947,5 +947,6 @@ +@@ -947,5 +947,6 @@ main(argc, argv) char *env; env = (char *)getenv("XGRABSC"); xgrabsc(argc, argv, env); + return 0; } #endif ---- xgrabsc.h +Index: xgrabsc.h +=================================================================== +--- xgrabsc.h.orig +++ xgrabsc.h @@ -74,7 +74,8 @@ #include "virtual.h" @@ -698,9 +714,11 @@ #define MAX_CELLS 256 #define TRUE 1 #define FALSE 0 ---- xgrabxm.c +Index: xgrabxm.c +=================================================================== +--- xgrabxm.c.orig +++ xgrabxm.c -@@ -102,8 +102,8 @@ +@@ -102,8 +102,8 @@ typedef enum { radioType encValue = PS_NORMAL; radioType cnvValue = NO_DITHER; @@ -711,7 +729,7 @@ radioType outValue = TOFILE; -@@ -748,4 +748,5 @@ +@@ -748,4 +748,5 @@ int main(argc, argv, envp) XtRealizeWidget(hShell); XtAppMainLoop(appContext); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zoo for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package zoo for openSUSE:Factory checked in at Fri Nov 27 16:07:52 CET 2009. -------- --- zoo/zoo.changes 2009-08-13 22:37:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/zoo/zoo.changes 2009-11-24 19:59:38.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 24 18:59:06 UTC 2009 - crrodriguez(a)opensuse.org + +- refresh patches with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zoo.spec ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:01.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:01.000000000 +0100 @@ -23,7 +23,7 @@ Group: Productivity/Archiving/Compression AutoReqProv: on Version: 2.10 -Release: 1000 +Release: 1001 Summary: Pack Program Source: zoo.tar.gz Patch0: zoo.patch @@ -56,13 +56,13 @@ %prep %setup -q -n zoo %patch0 -%patch1 -p1 -%patch2 -p1 +%patch1 +%patch2 %patch3 %patch4 %patch5 %patch6 -%patch7 -p1 +%patch7 %patch8 %build ++++++ zoo-2.10-CAN-2005-2349.patch ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:01.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:01.000000000 +0100 @@ -1,6 +1,8 @@ ---- portable.c -+++ portable.c -@@ -364,6 +364,31 @@ +Index: portable.c +=================================================================== +--- portable.c.orig 1991-07-11 21:07:34.000000000 +0200 ++++ portable.c 2009-11-24 19:46:08.992658000 +0100 +@@ -364,6 +364,31 @@ ZOOFILE zoo_file; show_dir(direntry); } #endif ++++++ zoo-2.10-security-infinite_loop.patch ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:02.000000000 +0100 @@ -1,27 +1,28 @@ -diff -u zoo/zooext.c zoo-patched/zooext.c ---- zoo/zooext.c 1991-07-11 15:08:00.000000000 -0400 -+++ zoo-patched/zooext.c 2007-03-16 16:45:28.000000000 -0500 -@@ -89,6 +89,7 @@ +Index: zooext.c +=================================================================== +--- zooext.c.orig 1991-07-11 21:08:00.000000000 +0200 ++++ zooext.c 2009-11-24 19:46:09.928625000 +0100 +@@ -89,6 +89,7 @@ int alloc_size; #endif struct direntry direntry; /* directory entry */ int first_dir = 1; /* first dir entry seen? */ +unsigned long zoo_pointer = 0; /* Track our position in the file */ - + static char extract_ver[] = "Zoo %d.%d is needed to extract %s.\n"; static char no_space[] = "Insufficient disk space to extract %s.\n"; -@@ -169,6 +170,9 @@ - exit_status = 1; +@@ -169,6 +170,9 @@ if (fiz_ofs != 0L) { /* i + exit_status = 1; } zooseek (zoo_file, zoo_header.zoo_start, 0); /* seek to where data begins */ + + /* Begin tracking our position in the file */ + zoo_pointer = zoo_header.zoo_start; } - + #ifndef PORTABLE -@@ -597,6 +601,12 @@ +@@ -597,6 +601,12 @@ bit 23==0 and bit 22==1. */ } /* end if */ - + loop_again: + + /* Make sure we are not seeking to already processed data */ @@ -31,29 +32,30 @@ + zooseek (zoo_file, next_ptr, 0); /* ..seek to next dir entry */ } /* end while */ - -diff -u zoo/zoolist.c zoo-patched/zoolist.c ---- zoo/zoolist.c 1991-07-11 15:08:04.000000000 -0400 -+++ zoo-patched/zoolist.c 2007-03-16 16:45:20.000000000 -0500 -@@ -92,6 +92,7 @@ + +Index: zoolist.c +=================================================================== +--- zoolist.c.orig 1991-07-11 21:08:04.000000000 +0200 ++++ zoolist.c 2009-11-24 19:46:09.933625000 +0100 +@@ -92,6 +92,7 @@ int genson = 1; /* enable/disable ge int show_mode = 0; /* show file protection */ #endif int first_dir = 1; /* if first direntry -- to adjust dat_ofs */ +unsigned long zoo_pointer = 0; /* Track our position in the file */ - + while (*option) { switch (*option) { -@@ -211,6 +212,9 @@ - show_acmt (&zoo_header, zoo_file, 0); /* show archive comment */ - } - +@@ -211,6 +212,9 @@ if (fiz_ofs != 0L) { /* i + show_acmt (&zoo_header, zoo_file, 0); /* show archive comment */ + } + + /* Begin tracking our position in the file */ + zoo_pointer = zoo_header.zoo_start; + /* Seek to the beginning of the first directory entry */ if (zooseek (zoo_file, zoo_header.zoo_start, 0) != 0) { ercount++; -@@ -437,6 +441,11 @@ +@@ -437,6 +441,11 @@ if (fiz_ofs != 0L) { /* i if (verb_list && !fast) show_comment (&direntry, zoo_file, 0, (char *) NULL); } /* end if (lots of conditions) */ ++++++ zoo-2.10-tempfile.patch ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:02.000000000 +0100 @@ -1,6 +1,8 @@ ---- zoo/zoopack.c.tempfile Thu Jul 11 21:08:04 1991 -+++ zoo/zoopack.c Fri Jan 18 13:34:56 2002 -@@ -171,8 +171,19 @@ +Index: zoopack.c +=================================================================== +--- zoopack.c.orig 1991-07-11 21:08:04.000000000 +0200 ++++ zoopack.c 2009-11-24 19:46:08.530710000 +0100 +@@ -171,8 +171,19 @@ if (!curr_dir) { } else { strcpy (temp_file, xes); } ++++++ zoo-fclose.patch ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:02.000000000 +0100 @@ -1,6 +1,8 @@ ---- bilf.c.orig 2009-08-13 22:32:15.000000000 +0200 -+++ bilf.c 2009-08-13 22:32:24.000000000 +0200 -@@ -99,7 +99,7 @@ +Index: bilf.c +=================================================================== +--- bilf.c.orig 1991-07-11 21:06:26.000000000 +0200 ++++ bilf.c 2009-11-24 19:46:10.176536000 +0100 +@@ -99,7 +99,7 @@ char *outname, *inname; while ((count = fread (buffer, 1, sizeof (buffer), infile)) > 0) count = fwrite (buffer, 1, count, outfile); ++++++ zoo-gcc.patch ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:02.000000000 +0100 @@ -1,19 +1,21 @@ -diff -uNr zoo.orig/makefile zoo/makefile ---- zoo.orig/makefile 1992-07-27 06:01:40.000000000 +0200 -+++ zoo/makefile 2002-11-25 16:41:06.000000000 +0100 -@@ -21,7 +21,7 @@ - CC = cc +Index: makefile +=================================================================== +--- makefile.orig 2009-11-24 19:46:08.143710000 +0100 ++++ makefile 2009-11-24 19:46:08.754711000 +0100 +@@ -21,7 +21,7 @@ MAKE = make # needed for some syst + CC = gcc CFLAGS = MODEL = -EXTRA = -DBIG_MEM -DNDEBUG +EXTRA = -DBIG_MEM -DNDEBUG -DANSI_PROTO LINTFLAGS = -DLINT OPTIM = -O - DESTDIR = /usr/local/bin -diff -uNr zoo.orig/options.h zoo/options.h ---- zoo.orig/options.h 1991-07-11 21:07:32.000000000 +0200 -+++ zoo/options.h 2002-11-25 16:41:30.000000000 +0100 -@@ -104,7 +104,7 @@ + DESTDIR = /usr/bin +Index: options.h +=================================================================== +--- options.h.orig 2009-11-24 19:46:08.151711000 +0100 ++++ options.h 2009-11-24 19:46:08.758710000 +0100 +@@ -104,7 +104,7 @@ For documentation about this file, see o #define GETTZ #define FATTR #define T_SIGNAL int ++++++ zoo.patch ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:02.000000000 +0100 @@ -1,6 +1,8 @@ ---- basename.c -+++ basename.c -@@ -18,7 +18,7 @@ +Index: basename.c +=================================================================== +--- basename.c.orig 1991-07-11 21:06:24.000000000 +0200 ++++ basename.c 2009-11-24 19:46:08.134708000 +0100 +@@ -18,7 +18,7 @@ Copyright (C) 1986, 1987 Rahul Dhesi -- /* This function strips device/directory information from a pathname and returns just the plain filename */ @@ -9,8 +11,10 @@ char *pathname; char fname[]; { ---- makefile -+++ makefile +Index: makefile +=================================================================== +--- makefile.orig 1992-07-27 06:01:40.000000000 +0200 ++++ makefile 2009-11-24 19:46:08.143710000 +0100 @@ -18,13 +18,13 @@ MAKE = make # needed for some systems e.g. older BSD @@ -27,7 +31,7 @@ #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ -@@ -107,10 +107,10 @@ +@@ -107,10 +107,10 @@ bsdansi: convex: $(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3 -DANSI_HDRS" $(TARGETS) @@ -40,9 +44,11 @@ $(TARGETS) # linux as above, static linked ---- options.h -+++ options.h -@@ -89,7 +89,7 @@ +Index: options.h +=================================================================== +--- options.h.orig 1991-07-11 21:07:32.000000000 +0200 ++++ options.h 2009-11-24 19:46:08.151711000 +0100 +@@ -89,7 +89,7 @@ For documentation about this file, see o /***********************************************************************/ #ifdef BSD4_3 @@ -51,9 +57,11 @@ #define FILTER #define IO_MACROS #define EXISTS(f) (access(f, 00) == 0) ---- various.h -+++ various.h -@@ -26,6 +26,7 @@ +Index: various.h +=================================================================== +--- various.h.orig 1991-07-11 21:07:38.000000000 +0200 ++++ various.h 2009-11-24 19:46:08.157708000 +0100 +@@ -26,6 +26,7 @@ the predefined type FILE. #ifdef ANSI_HDRS /* if not defined in stdio.h */ # include <string.h> # include <stdlib.h> @@ -61,9 +69,11 @@ #else FILE *fdopen PARMS ((int, char *)); FILE *fopen PARMS ((char *, char *)); ---- zooadd.c -+++ zooadd.c -@@ -132,7 +132,7 @@ +Index: zooadd.c +=================================================================== +--- zooadd.c.orig 1991-07-11 21:07:56.000000000 +0200 ++++ zooadd.c 2009-11-24 19:46:08.172712000 +0100 +@@ -132,7 +132,7 @@ if (exists (zoo_path)) { if (zoo_file == NOFILE) prterror ('f', could_not_open, zoo_path); @@ -72,7 +82,7 @@ rootname (zoo_path, zoo_bak); /* name without extension */ strcat (zoo_bak, BACKUP_EXT); /* name of backup of this archive */ -@@ -222,7 +222,7 @@ +@@ -222,7 +222,7 @@ while (1) { break; } @@ -81,9 +91,11 @@ this_file = zooopen(this_path, Z_READ); if (this_file == NOFILE) { ---- zoofns.h -+++ zoofns.h -@@ -85,7 +85,7 @@ +Index: zoofns.h +=================================================================== +--- zoofns.h.orig 1991-07-11 21:08:00.000000000 +0200 ++++ zoofns.h 2009-11-24 19:46:08.185709000 +0100 +@@ -85,7 +85,7 @@ void addbfcrc PARMS ((char *, int)); void addfname PARMS ((char *, long, unsigned int, unsigned int, unsigned, unsigned)); void add_version PARMS ((char *, struct direntry *)); ++++++ zoo-return.patch ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:02.000000000 +0100 @@ -1,6 +1,8 @@ ---- ar.h -+++ ar.h -@@ -116,7 +116,9 @@ +Index: ar.h +=================================================================== +--- ar.h.orig 1992-07-27 03:35:14.000000000 +0200 ++++ ar.h 2009-11-24 19:46:09.214621000 +0100 +@@ -116,7 +116,9 @@ int make_tree void move_left(); #else # define MOVE_LEFT memmove @@ -10,17 +12,21 @@ #endif #if 0 ---- bsd.c -+++ bsd.c -@@ -104,4 +104,5 @@ +Index: bsd.c +=================================================================== +--- bsd.c.orig 1991-07-11 21:06:26.000000000 +0200 ++++ bsd.c 2009-11-24 19:46:09.223621000 +0100 +@@ -104,4 +104,5 @@ int zootrunc(f) FILE *f; seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) return ftruncate(fd, seekpos); + return 0; } ---- mstime.i -+++ mstime.i -@@ -12,6 +12,7 @@ +Index: mstime.i +=================================================================== +--- mstime.i.orig 1991-07-11 21:07:28.000000000 +0200 ++++ mstime.i 2009-11-24 19:46:09.230621000 +0100 +@@ -12,6 +12,7 @@ static char mstimeid[]="@(#) mstime.i 2. Function mstime() converts time in seconds since January 1 of BASEYEAR to MS-DOS format date and time. */ @@ -28,9 +34,11 @@ mstime(longtime, date, time) long longtime; /* input: seconds since Jan 1, BASEYEAR */ int *date, *time; /* output: MS-DOS format date and time */ ---- nixtime.i -+++ nixtime.i -@@ -36,6 +36,7 @@ +Index: nixtime.i +=================================================================== +--- nixtime.i.orig 1991-07-11 21:07:30.000000000 +0200 ++++ nixtime.i 2009-11-24 19:46:09.245621000 +0100 +@@ -36,6 +36,7 @@ unsigned *date, *time; (tm->tm_hour << 11); } @@ -38,9 +46,11 @@ } /***************** ---- options.h -+++ options.h -@@ -157,11 +157,13 @@ +Index: options.h +=================================================================== +--- options.h.orig 2009-11-24 19:46:08.758710000 +0100 ++++ options.h 2009-11-24 19:46:09.249623000 +0100 +@@ -157,11 +157,13 @@ For documentation about this file, see o #define GETTZ #define FATTR #define T_SIGNAL void ++++++ zoo-security_parse.patch ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:02.000000000 +0100 @@ -1,6 +1,8 @@ ---- parse.c -+++ parse.c -@@ -39,7 +39,7 @@ +Index: parse.c +=================================================================== +--- parse.c.orig 1991-07-11 21:07:34.000000000 +0200 ++++ parse.c 2009-11-24 19:46:09.705623000 +0100 +@@ -39,7 +39,7 @@ char *fname; char *namep; /* points to relevant part of tempname */ char *p; ++++++ zoo-security_pathsize.patch ++++++ --- /var/tmp/diff_new_pack.zs3frb/_old 2009-11-27 16:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.zs3frb/_new 2009-11-27 16:07:02.000000000 +0100 @@ -1,6 +1,8 @@ ---- misc.c -+++ misc.c -@@ -135,11 +135,17 @@ +Index: misc.c +=================================================================== +--- misc.c.orig 1991-07-11 21:07:26.000000000 +0200 ++++ misc.c 2009-11-24 19:46:09.525623000 +0100 +@@ -135,11 +135,17 @@ if available, else the short filename is char *fullpath (direntry) struct direntry *direntry; { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Tk for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package perl-Tk for openSUSE:Factory checked in at Fri Nov 27 16:06:49 CET 2009. -------- --- perl-Tk/perl-Tk.changes 2008-09-29 14:10:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Tk/perl-Tk.changes 2009-11-03 20:21:33.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:09:38 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Tk.spec ++++++ --- /var/tmp/diff_new_pack.P06hoJ/_old 2009-11-27 16:03:48.000000000 +0100 +++ /var/tmp/diff_new_pack.P06hoJ/_new 2009-11-27 16:03:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Tk (Version 804.028) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,14 +23,14 @@ %ifnarch s390 s390x BuildRequires: xorg-x11-server %endif -License: Artistic License; Public Domain, Freeware +License: Artistic ; Public Domain, Freeware Group: Development/Libraries/Perl Requires: perl Provides: perl_tk Obsoletes: perl_tk AutoReqProv: on Version: 804.028 -Release: 50 +Release: 51 Summary: Perl Tk Url: http://cpan.org/modules/by-module/Tk/ Source: Tk-%{version}.tar.bz2 @@ -53,7 +53,7 @@ Nick Ing-Simmons <Nick.Ing-Simmons(a)tiuk.ti.com> %package devel -License: Artistic License; Public Domain, Freeware +License: Artistic ; Public Domain, Freeware AutoReqProv: on Requires: %{name} = %{version} Provides: perl-Tk:/usr/lib/perl5/vendor_perl/5.8.8/x86_64-linux-thread-multi/Tk/pTk/Lang.h ++++++ Tk-804.028-refcnt.diff ++++++ --- /var/tmp/diff_new_pack.P06hoJ/_old 2009-11-27 16:03:48.000000000 +0100 +++ /var/tmp/diff_new_pack.P06hoJ/_new 2009-11-27 16:03:48.000000000 +0100 @@ -1,10 +1,12 @@ ---- pTk/mTk/unix/tkUnixXft.c +Index: pTk/mTk/unix/tkUnixXft.c +=================================================================== +--- pTk/mTk/unix/tkUnixXft.c.orig +++ pTk/mTk/unix/tkUnixXft.c -@@ -215,6 +215,7 @@ - for (i = 0; i < set->nfont; i++) - { +@@ -165,6 +165,7 @@ InitFont( + + for (i = 0; i < set->nfont; i++) { fontPtr->faces[i].ftFont = 0; + FcPatternReference (set->fonts[i]); fontPtr->faces[i].source = set->fonts[i]; - if (FcPatternGetCharSet (set->fonts[i], FC_CHARSET, 0, &charset) == FcResultMatch) - fontPtr->faces[i].charset = FcCharSetCopy (charset); + if (FcPatternGetCharSet(set->fonts[i], FC_CHARSET, 0, + &charset) == FcResultMatch) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xsane for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package xsane for openSUSE:Factory checked in at Fri Nov 27 16:03:36 CET 2009. -------- --- xsane/xsane.changes 2009-07-27 18:38:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/xsane/xsane.changes 2009-11-26 14:22:50.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 26 14:22:20 CET 2009 - dimstar(a)opensuse.org + +- Rebase patches to apply with fuzz=0. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsane.spec ++++++ --- /var/tmp/diff_new_pack.RoOYhR/_old 2009-11-27 16:02:57.000000000 +0100 +++ /var/tmp/diff_new_pack.RoOYhR/_new 2009-11-27 16:02:57.000000000 +0100 @@ -20,7 +20,7 @@ Name: xsane BuildRequires: gimp-devel libgphoto2-devel liblcms-devel libtiff-devel sane-backends update-desktop-files -License: GPL v2 or later +License: GPLv2+ Group: Hardware/Scanner # Require the SANE base system in sane-backends explicitely to be on the safe side # because whatever third-party scanner driver package (e.g. a third-party Iscan RPM) @@ -36,7 +36,7 @@ AutoReqProv: on Summary: A GTK-Based Graphical Scanning Front-End for SANE Version: 0.997 -Release: 1 +Release: 2 Url: http://www.xsane.org/ # URL for Source0: http://www.xsane.org/download/xsane-0.995.tar.gz Source0: xsane-%{version}.tar.bz2 ++++++ no-eula.patch ++++++ --- /var/tmp/diff_new_pack.RoOYhR/_old 2009-11-27 16:02:57.000000000 +0100 +++ /var/tmp/diff_new_pack.RoOYhR/_new 2009-11-27 16:02:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/xsane.c.orig 2007-09-28 17:24:56.000000000 +0200 -+++ src/xsane.c 2008-03-05 12:22:56.000000000 +0100 -@@ -5795,19 +5795,7 @@ static int xsane_init(int argc, char **a +Index: src/xsane.c +=================================================================== +--- src/xsane.c.orig ++++ src/xsane.c +@@ -5815,19 +5815,7 @@ static int xsane_init(int argc, char **a xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */ } @@ -21,11 +23,13 @@ xsane_pref_restore_media(); ---- src/xsane.h.orig 2007-08-13 09:20:32.000000000 +0200 -+++ src/xsane.h 2008-03-06 13:48:05.000000000 +0100 +Index: src/xsane.h +=================================================================== +--- src/xsane.h.orig ++++ src/xsane.h @@ -93,9 +93,9 @@ - #define XSANE_VERSION "0.995" + #define XSANE_VERSION "0.997" #define XSANE_AUTHOR "Oliver Rauch" -#define XSANE_COPYRIGHT "Oliver Rauch" -#define XSANE_DATE "1998-2007" ++++++ remove-non-working-help.patch ++++++ --- /var/tmp/diff_new_pack.RoOYhR/_old 2009-11-27 16:02:57.000000000 +0100 +++ /var/tmp/diff_new_pack.RoOYhR/_new 2009-11-27 16:02:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/xsane.c.orig2 2008-03-05 12:22:56.000000000 +0100 -+++ src/xsane.c 2008-03-05 15:46:57.000000000 +0100 -@@ -4247,27 +4247,6 @@ static GtkWidget *xsane_help_build_menu( +Index: src/xsane.c +=================================================================== +--- src/xsane.c.orig ++++ src/xsane.c +@@ -4258,27 +4258,6 @@ static GtkWidget *xsane_help_build_menu( gtk_widget_show(item); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dvb for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package dvb for openSUSE:Factory checked in at Fri Nov 27 16:02:34 CET 2009. -------- --- dvb/dvb.changes 2009-11-10 12:00:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/dvb/dvb.changes 2009-11-24 19:11:58.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 24 18:11:25 UTC 2009 - crrodriguez(a)opensuse.org + +- refresh patches with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dvb.spec ++++++ --- /var/tmp/diff_new_pack.62zuIR/_old 2009-11-27 16:00:31.000000000 +0100 +++ /var/tmp/diff_new_pack.62zuIR/_new 2009-11-27 16:00:31.000000000 +0100 @@ -24,7 +24,7 @@ Name: dvb BuildRequires: libusb-devel %define firmwaredir /lib/firmware -License: GPL v2 or later +License: GPLv2+ Group: Hardware/TV AutoReqProv: on PreReq: %fillup_prereq %insserv_prereq @@ -66,7 +66,7 @@ %prep %setup -q -n dvb-apps-%{version} -%patch -p1 +%patch %patch1 find -name .hg -type d | xargs rm -rfv find -name .cvsignore -type f | xargs rm -fv ++++++ dvb-apps-dvbnet.diff ++++++ --- /var/tmp/diff_new_pack.62zuIR/_old 2009-11-27 16:00:31.000000000 +0100 +++ /var/tmp/diff_new_pack.62zuIR/_new 2009-11-27 16:00:31.000000000 +0100 @@ -1,7 +1,7 @@ -Index: dvb-apps/util/dvbnet/net_start.sh +Index: util/dvbnet/net_start.sh =================================================================== ---- dvb-apps.orig/util/dvbnet/net_start.sh -+++ dvb-apps/util/dvbnet/net_start.sh +--- util/dvbnet/net_start.sh.orig 2009-11-08 17:34:21.000000000 +0100 ++++ util/dvbnet/net_start.sh 2009-11-24 19:10:12.806111000 +0100 @@ -4,7 +4,7 @@ PID=0x511 DEV_NAME=dvb0_0 IP_ADDR=10.1.1.1 @@ -11,10 +11,10 @@ /sbin/ifconfig $DEV_NAME $IP_ADDR -Index: dvb-apps/util/dvbnet/net_start.pl +Index: util/dvbnet/net_start.pl =================================================================== ---- dvb-apps.orig/util/dvbnet/net_start.pl -+++ dvb-apps/util/dvbnet/net_start.pl +--- util/dvbnet/net_start.pl.orig 2009-11-08 17:34:21.000000000 +0100 ++++ util/dvbnet/net_start.pl 2009-11-24 19:10:12.811110000 +0100 @@ -12,7 +12,7 @@ sub dvbnet { local ($ADAPTER, $NETDEV, $PID, $IP_ADDR) = @_; ++++++ dvb-includes.diff ++++++ --- /var/tmp/diff_new_pack.62zuIR/_old 2009-11-27 16:00:31.000000000 +0100 +++ /var/tmp/diff_new_pack.62zuIR/_new 2009-11-27 16:00:31.000000000 +0100 @@ -1,5 +1,7 @@ ---- lib/libdvbapi/dvbaudio.c -+++ lib/libdvbapi/dvbaudio.c +Index: lib/libdvbapi/dvbaudio.c +=================================================================== +--- lib/libdvbapi/dvbaudio.c.orig 2009-11-08 17:34:21.000000000 +0100 ++++ lib/libdvbapi/dvbaudio.c 2009-11-24 19:10:13.089021000 +0100 @@ -25,6 +25,7 @@ #include <fcntl.h> #include <unistd.h> @@ -8,8 +10,10 @@ #include <linux/dvb/audio.h> #include <errno.h> #include "dvbaudio.h" ---- test/hex_dump.c -+++ test/hex_dump.c +Index: test/hex_dump.c +=================================================================== +--- test/hex_dump.c.orig 2009-11-08 17:34:21.000000000 +0100 ++++ test/hex_dump.c 2009-11-24 19:10:13.096022000 +0100 @@ -20,6 +20,7 @@ #include <stdio.h> @@ -18,18 +22,22 @@ #include "hex_dump.h" ---- test/test_av.c -+++ test/test_av.c +Index: test/test_av.c +=================================================================== +--- test/test_av.c.orig 2009-11-08 17:34:21.000000000 +0100 ++++ test/test_av.c 2009-11-24 19:10:13.101025000 +0100 @@ -29,6 +29,7 @@ #include <fcntl.h> #include <time.h> #include <unistd.h> +#include <stdint.h> + #include <linux/types.h> #include <linux/dvb/audio.h> - #include <linux/dvb/video.h> ---- util/scan/diseqc.c -+++ util/scan/diseqc.c +Index: util/scan/diseqc.c +=================================================================== +--- util/scan/diseqc.c.orig 2009-11-08 17:34:21.000000000 +0100 ++++ util/scan/diseqc.c 2009-11-24 19:10:13.112020000 +0100 @@ -1,6 +1,6 @@ -#include <linux/dvb/frontend.h> #include <sys/ioctl.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-phone-manager for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package gnome-phone-manager for openSUSE:Factory checked in at Fri Nov 27 15:59:54 CET 2009. -------- --- GNOME/gnome-phone-manager/gnome-phone-manager.changes 2009-03-18 07:09:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-phone-manager/gnome-phone-manager.changes 2009-11-26 14:07:02.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 26 13:44:18 CET 2009 - dimstar(a)opensuse.org + +- Rebase patches to apply with fuzz=0. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-phone-manager.spec ++++++ --- /var/tmp/diff_new_pack.eBsoHS/_old 2009-11-27 15:59:33.000000000 +0100 +++ /var/tmp/diff_new_pack.eBsoHS/_new 2009-11-27 15:59:33.000000000 +0100 @@ -30,10 +30,10 @@ BuildRequires: telepathy-glib-devel BuildRequires: update-desktop-files Version: 0.65 -Release: 1 +Release: 2 Url: http://usefulinc.com/software/phonemgr Group: Hardware/Mobile -License: GPL v2 or later +License: GPLv2+ Summary: Phone Manager for GNOME Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-phone-manager/0.8/%{name}-%{ver… # PATCH-FIX-OPENSUSE gnome-phone-manager-desktop-icon-check.patch bnc337219 @@ -58,7 +58,7 @@ Edd Dumbill <edd(a)usefulinc.com> %package telepathy -License: GPL v2 or later +License: GPLv2+ Summary: Telepathy connection manager for GNOME Phone Manager Group: Hardware/Mobile Requires: %{name} = %{version} @@ -104,6 +104,7 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre + %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun ++++++ gnome-phone-manager-desktop-icon-check.patch ++++++ --- /var/tmp/diff_new_pack.eBsoHS/_old 2009-11-27 15:59:33.000000000 +0100 +++ /var/tmp/diff_new_pack.eBsoHS/_new 2009-11-27 15:59:33.000000000 +0100 @@ -1,7 +1,9 @@ ---- src/gnome-phone-manager.desktop.in +Index: src/gnome-phone-manager.desktop.in +=================================================================== +--- src/gnome-phone-manager.desktop.in.orig +++ src/gnome-phone-manager.desktop.in -@@ -2,7 +2,7 @@ - Encoding=UTF-8 +@@ -1,7 +1,7 @@ + [Desktop Entry] _Name=Phone Manager _Comment=Receive and send text messages from your mobile phone -Icon=phone ++++++ gnome-phone-manager-warnings.patch ++++++ --- /var/tmp/diff_new_pack.eBsoHS/_old 2009-11-27 15:59:33.000000000 +0100 +++ /var/tmp/diff_new_pack.eBsoHS/_new 2009-11-27 15:59:33.000000000 +0100 @@ -1,12 +1,13 @@ === modified file 'libgsm/glibgsmtest.c' ---- libgsm/glibgsmtest.c 2008-05-08 00:47:56 +0000 -+++ libgsm/glibgsmtest.c 2008-05-08 00:50:34 +0000 -@@ -89,6 +89,7 @@ +Index: libgsm/glibgsmtest.c +=================================================================== +--- libgsm/glibgsmtest.c.orig ++++ libgsm/glibgsmtest.c +@@ -95,6 +95,7 @@ send_message (PhonemgrListener *l) { phonemgr_listener_queue_message (l, "+447736665138", "test message XXX", TRUE); + return FALSE; } - int - + static gboolean debug = FALSE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager-kde4 for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package NetworkManager-kde4 for openSUSE:Factory checked in at Fri Nov 27 15:59:17 CET 2009. -------- --- KDE/NetworkManager-kde4/NetworkManager-kde4.changes 2009-11-02 16:29:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/NetworkManager-kde4/NetworkManager-kde4.changes 2009-11-20 10:01:04.000000000 +0100 @@ -1,0 +2,22 @@ +Fri Nov 20 07:40:03 UTC 2009 - wstephenson(a)novell.com + +- Add novellvpn plugin (bnc#438310, bnc#400710) +- Build on openSUSE 11.1 and SLE11 + +------------------------------------------------------------------- +Thu Nov 19 22:53:23 CET 2009 - llunak(a)novell.com + +- sync 11.2 KDE packages with SLE (fate#305847) + +------------------------------------------------------------------- +Wed Nov 18 17:03:50 UTC 2009 - wstephenson(a)novell.com + +- Fix bnc#553908 - no routing set with DHCP connections +- Notify NetworkManager correctly when connections are edited +- Fix broken doubleclick in Other Networks dialog +- Don't show Enable wireless when no wireless hardware present +- Prompt for missing VPN secrets on connect +- Fix openVPN with X509 certificates only +- Fix sorting of newly added connections + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- add-novellvpn-plugin.diff code11_networkmanager_no_neverdefault.diff r1047285-doubleclick-other-networks-dialog.diff r1047562-invalid-timestamps.diff r1047612-hide-wireless-no-hardware.diff r1047763-update-settings-signal.diff r1048007-routing-not-accepted.diff r1048697-const-iterators.diff r1049067-vpn-secrets-prompt.diff r1050511-openvpn-x509-no-password.diff r1050784-activatable-sorting.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-kde4.spec ++++++ --- /var/tmp/diff_new_pack.UWzOWs/_old 2009-11-27 15:57:45.000000000 +0100 +++ /var/tmp/diff_new_pack.UWzOWs/_new 2009-11-27 15:57:45.000000000 +0100 @@ -21,14 +21,25 @@ Name: NetworkManager-kde4 BuildRequires: NetworkManager-devel kdebase4-workspace-devel libknotificationitem-devel Version: 0.9.svn1043876 -Release: 1 -License: GPL v2 or later +Release: 2 +License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/GUI/KDE Summary: NetworkManager client for KDE 4 Source0: networkmanager.tar.bz2 Source1: networkmanager-po.tar.bz2 Source2: knetworkmanager.default.sh +Patch0: r1047285-doubleclick-other-networks-dialog.diff +Patch1: r1047562-invalid-timestamps.diff +Patch2: r1047612-hide-wireless-no-hardware.diff +Patch3: r1047763-update-settings-signal.diff +Patch4: r1048007-routing-not-accepted.diff +Patch5: r1048697-const-iterators.diff +Patch6: r1049067-vpn-secrets-prompt.diff +Patch7: r1050511-openvpn-x509-no-password.diff +Patch8: r1050784-activatable-sorting.diff +Patch9: code11_networkmanager_no_neverdefault.diff +Patch10: add-novellvpn-plugin.diff Requires: %{name}-lang = %{version} Requires: %{name}-libs = %{version}-%{release} Provides: NetworkManager-client @@ -62,7 +73,7 @@ network connections on systems that use the NetworkManager servicce %package -n plasmoid-networkmanagement -License: GPL v2 or later +License: GPLv2+ Summary: NetworkManager client for KDE 4 Group: System/GUI/KDE Provides: NetworkManager-client @@ -74,7 +85,7 @@ on systems that use the NetworkManager service. %package -n NetworkManager-openvpn-kde4 -License: GPL v2 or later +License: GPLv2+ Summary: NetworkManager client for KDE 4 Group: System/GUI/KDE Provides: NetworkManager-openvpn-frontend @@ -91,7 +102,7 @@ Will Stephenson <wstephenson(a)novell.com> %package -n NetworkManager-pptp-kde4 -License: GPL v2 or later +License: GPLv2+ Summary: NetworkManager client for KDE 4 Group: System/GUI/KDE Provides: NetworkManager-pptp-frontend @@ -107,7 +118,7 @@ Will Stephenson <wstephenson(a)novell.com> %package -n NetworkManager-vpnc-kde4 -License: GPL v2 or later +License: GPLv2+ Summary: NetworkManager client for KDE 4 Group: System/GUI/KDE Provides: NetworkManager-vpnc-frontend @@ -122,9 +133,39 @@ -------- Will Stephenson <wstephenson(a)novell.com> +%package -n NetworkManager-novellvpn-kde4 +License: GPLv2+ +Summary: NovellVPN NetworkManager plugin for KDE 4 +Group: System/GUI/KDE +Provides: NetworkManager-novellvpn-frontend +Requires: %{name}-libs = %{version}-%{release} +Requires: NetworkManager-novellvpn + +%description -n NetworkManager-novellvpn-kde4 +NovellVPN VPN plugin for KDE Network Management components. + + + +Authors: +-------- + Will Stephenson <wstephenson(a)novell.com> + %lang_package %prep %setup -q -n networkmanager -a 1 +%patch0 +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 +%patch8 +%if %suse_version < 1120 +%patch9 +%endif +%patch10 echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt echo "add_subdirectory(po)" >> CMakeLists.txt @@ -214,4 +255,9 @@ %{_libdir}/kde4/networkmanagement_pptpui.so %{_datadir}/kde4/services/networkmanagement_pptpui.desktop +%files -n NetworkManager-novellvpn-kde4 +%defattr(-,root,root) +%{_libdir}/kde4/networkmanagement_novellvpnui.so +%{_datadir}/kde4/services/networkmanagement_novellvpnui.desktop + %changelog ++++++ add-novellvpn-plugin.diff ++++++ ++++ 870 lines (skipped) ++++++ code11_networkmanager_no_neverdefault.diff ++++++ Index: libs/ui/ipv4widget.cpp =================================================================== --- libs/ui/ipv4widget.cpp (revision 1051776) +++ libs/ui/ipv4widget.cpp (working copy) @@ -54,6 +54,8 @@ Q_D(IpV4Widget); d->ui.setupUi(this); + // Not present in NM 0.7.1 as shipped with CODE11 + d->ui.cbNeverDefault->hide(); QString str_auto; QString str_auto_only; Knm::Connection::Type connType = connection->type(); Index: backends/NetworkManager/settings/ipv4dbus.cpp =================================================================== --- backends/NetworkManager/settings/ipv4dbus.cpp (revision 1051776) +++ backends/NetworkManager/settings/ipv4dbus.cpp (working copy) @@ -35,9 +35,9 @@ if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES))) { setting->setIgnoreautoroute(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES)).value<bool>()); } - if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT))) { - setting->setNeverdefault(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT)).value<bool>()); - } +//X if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT))) { +//X setting->setNeverdefault(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT)).value<bool>()); +//X } if (map.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID))) { setting->setDhcpclientid(map.value(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID)).value<QString>()); } @@ -104,7 +104,7 @@ //map.insert(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS), setting->ignoredhcpdns()); insertIfTrue(map, NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, setting->ignoreautoroute()); - insertIfTrue(map, NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, setting->neverdefault()); + //insertIfTrue(map, NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, setting->neverdefault()); insertIfNonEmpty(map, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, setting->dhcpclientid()); insertIfNonEmpty(map, NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, setting->dhcphostname()); return map; ++++++ r1047285-doubleclick-other-networks-dialog.diff ++++++ Index: monolithic/otherwirelessnetworkdialog.cpp =================================================================== --- monolithic/otherwirelessnetworkdialog.cpp (revision 1047284) +++ monolithic/otherwirelessnetworkdialog.cpp (revision 1047285) @@ -60,7 +60,7 @@ m_ui.twNetworks->setFirstItemColumnSpanned(m_newAdhocItem, true); m_newAdhocItem->setIcon(0, SmallIcon("document-new")); - connect(m_ui.twNetworks, SIGNAL(itemDoubleClicked(QTreeWidgetItem*)), this, SLOT(itemDoubleClicked(QTreeWidgetItem*))); + connect(m_ui.twNetworks, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(itemDoubleClicked(QTreeWidgetItem*))); connect(m_ui.twNetworks, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged())); } ++++++ r1047562-invalid-timestamps.diff ++++++ Index: libs/internals/connectionpersistence.cpp =================================================================== --- libs/internals/connectionpersistence.cpp (revision 1047561) +++ libs/internals/connectionpersistence.cpp (revision 1047562) @@ -144,7 +144,8 @@ cg.writeEntry("uuid", m_connection->uuid().toString()); cg.writeEntry("type", Connection::typeAsString(m_connection->type())); cg.writeEntry("autoconnect", m_connection->autoConnect()); - cg.writeEntry("timestamp", m_connection->timestamp()); + if (m_connection->timestamp().isValid()) + cg.writeEntry("timestamp", m_connection->timestamp()); cg.writeEntry("icon", m_connection->iconName()); // save each setting ++++++ r1047612-hide-wireless-no-hardware.diff ++++++ Index: monolithic/knetworkmanagertrayicon.cpp =================================================================== --- monolithic/knetworkmanagertrayicon.cpp (revision 1047611) +++ monolithic/knetworkmanagertrayicon.cpp (revision 1047612) @@ -310,7 +310,8 @@ // add the housekeeping actions contextMenu()->addSeparator(); - if (d->interfaceTypes.testFlag(Solid::Control::NetworkInterface::Ieee80211)) { + + if (!wirelessDeviceUnis.isEmpty() /*TODO Bluetooth too */ && d->interfaceTypes.testFlag(Solid::Control::NetworkInterface::Ieee80211)) { contextMenu()->addAction(d->flightModeAction); } contextMenu()->addAction(d->prefsAction); ++++++ r1047763-update-settings-signal.diff ++++++ Index: backends/NetworkManager/busconnection.h =================================================================== --- backends/NetworkManager/busconnection.h (revision 1047762) +++ backends/NetworkManager/busconnection.h (revision 1047763) @@ -69,7 +69,7 @@ QString uuid() const; Knm::Connection * connection() const; Q_SIGNALS: - Q_SCRIPTABLE void Updated(QMap<QString, QMap<QString, QVariant> >); + Q_SCRIPTABLE void Updated(const QVariantMapMap &settings); Q_SCRIPTABLE void Removed(); public Q_SLOTS: ++++++ r1048007-routing-not-accepted.diff ++++++ Index: libs/internals/settings/ipv4.cpp =================================================================== --- libs/internals/settings/ipv4.cpp (revision 1048006) +++ libs/internals/settings/ipv4.cpp (revision 1048007) @@ -7,7 +7,9 @@ Ipv4Setting::Ipv4Setting() : Setting(Setting::Ipv4), mMethod(Ipv4Setting::EnumMethod::Automatic), - mIgnoredhcpdns(false) + mIgnoredhcpdns(false), + mIgnoreautoroute(false), + mNeverdefault(false) { } ++++++ r1048697-const-iterators.diff ++++++ Index: libs/service/networkinterfaceactivatableprovider.cpp =================================================================== --- libs/service/networkinterfaceactivatableprovider.cpp (revision 1048696) +++ libs/service/networkinterfaceactivatableprovider.cpp (revision 1048697) @@ -178,8 +178,8 @@ void NetworkInterfaceActivatableProvider::handleUpdate(Knm::Connection * updatedConnection) { Q_D(NetworkInterfaceActivatableProvider); - QMultiHash<QString, Knm::InterfaceConnection*>::const_iterator i = d->activatables.find(updatedConnection->uuid()); - while (i != d->activatables.end() && i.key() == updatedConnection->uuid()) { + QMultiHash<QString, Knm::InterfaceConnection*>::const_iterator i = d->activatables.constFind(updatedConnection->uuid()); + while (i != d->activatables.constEnd() && i.key() == updatedConnection->uuid()) { Knm::InterfaceConnection * ifaceConnection = dynamic_cast<Knm::InterfaceConnection *>(i.value()); if (ifaceConnection) { Knm::InterfaceConnectionHelpers::syncInterfaceConnection(ifaceConnection, updatedConnection); Index: libs/ui/editlistdialog.cpp =================================================================== --- libs/ui/editlistdialog.cpp (revision 1048696) +++ libs/ui/editlistdialog.cpp (revision 1048697) @@ -64,7 +64,7 @@ void removeEmptyItems(QStringList &list) { QStringList::iterator it = list.begin(); - QStringList::const_iterator end = list.constEnd(); + const QStringList::iterator end = list.end(); while (it != end) { if ((*it).trimmed().isEmpty()) { it = list.erase(it); ++++++ r1049067-vpn-secrets-prompt.diff ++++++ Index: libs/internals/connectionpersistence.cpp =================================================================== --- libs/internals/connectionpersistence.cpp (revision 1049066) +++ libs/internals/connectionpersistence.cpp (revision 1049067) @@ -252,6 +252,7 @@ kDebug() << "Reading all entries for connection"; QMap<QString,QMap<QString,QString> > entries; QString key = m_connection->uuid() + QLatin1String("*"); + bool missingEntry = false; if (wallet->readMapList(key, entries) == 0) { foreach (Setting * setting, m_connection->settings()) { @@ -259,14 +260,23 @@ if (entries.contains(settingKey)) { QMap<QString,QString> settingSecrets = entries.value(settingKey); + if (settingSecrets.isEmpty()) { + kDebug() << "no secrets found for" << settingKey; + missingEntry = true; + break; + } kDebug() << settingSecrets; persistenceFor(setting)->restoreSecrets(settingSecrets); + } else if (setting->hasSecrets()) { + missingEntry = true; } } kDebug() << "Check connection:"; kDebug() << "secretsAvailable:" << m_connection->secretsAvailable(); - - emit loadSecretsResult(EnumError::NoError); + if (missingEntry) + emit loadSecretsResult(EnumError::MissingContents); + else + emit loadSecretsResult(EnumError::NoError); } else { kDebug() << "Wallet::readEntryList for :" << key << " failed"; emit loadSecretsResult(EnumError::MissingContents); Index: libs/ui/connectionsecretsjob.cpp =================================================================== --- libs/ui/connectionsecretsjob.cpp (revision 1049066) +++ libs/ui/connectionsecretsjob.cpp (revision 1049067) @@ -39,6 +39,7 @@ #include <KDialog> #include <KLocale> +#include <KServiceTypeTrader> #include <KStandardDirs> #include "802_11_wirelesswidget.h" @@ -53,8 +54,11 @@ #include "security/securitywidget.h" #include "security/securitywired8021x.h" +#include "settings/vpn.h" + #include "knmserviceprefs.h" #include "connection.h" +#include "vpnuiplugin.h" ConnectionSecretsJob::ConnectionSecretsJob(Knm::Connection* connection, const QString &settingName, const QStringList& secrets, bool requestNew, const QDBusMessage& request) @@ -131,7 +135,20 @@ } else if ( mSettingName == QLatin1String(NM_SETTING_SERIAL_SETTING_NAME)) { m_settingWidget = new PppWidget(m_connection, 0); } else if ( mSettingName == QLatin1String(NM_SETTING_VPN_SETTING_NAME)) { - // not supported yet, figure out the type of the vpn plugin, load it and its m_settingWidgetget + // get the type of vpn service + QString configFile = KStandardDirs::locate("data", + Knm::ConnectionPersistence::CONNECTION_PERSISTENCE_PATH + m_connection->uuid()); + m_connectionPersistence = new Knm::ConnectionPersistence(m_connection, + KSharedConfig::openConfig(configFile, KConfig::NoGlobals), + (Knm::ConnectionPersistence::SecretStorageMode)KNetworkManagerServicePrefs::self()->secretStorageMode()); + m_connectionPersistence->load(); + Knm::VpnSetting * vpnSetting = static_cast<Knm::VpnSetting*>(m_connection->setting(Knm::Setting::Vpn)); + // load the plugin and get its setting widget + QString error; + VpnUiPlugin * uiPlugin = KServiceTypeTrader::createInstanceFromQuery<VpnUiPlugin>( QString::fromLatin1( "NetworkManagement/VpnUiPlugin" ), QString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg(vpnSetting->pluginName() ), this, QVariantList(), &error ); + if (uiPlugin && error.isEmpty()) { + m_settingWidget= uiPlugin->widget(m_connection, 0); + } } else if ( mSettingName == QLatin1String(NM_SETTING_WIRED_SETTING_NAME)) { m_settingWidget = new WiredWidget(m_connection, 0); } else if ( mSettingName == QLatin1String(NM_SETTING_WIRELESS_SECURITY_SETTING_NAME)) { ++++++ r1050511-openvpn-x509-no-password.diff ++++++ Index: vpnplugins/openvpn/openvpnwidget.cpp =================================================================== --- vpnplugins/openvpn/openvpnwidget.cpp (revision 1050510) +++ vpnplugins/openvpn/openvpnwidget.cpp (revision 1050511) @@ -219,6 +219,9 @@ data.insert( NM_OPENVPN_KEY_CA, d->ui.x509CaFile->url().path().toUtf8()); data.insert( NM_OPENVPN_KEY_CERT, d->ui.x509Cert->url().path().toUtf8()); data.insert( NM_OPENVPN_KEY_KEY, d->ui.x509Key->url().path().toUtf8()); + // The OpenVPM NetworkManager plugin requires that the secrets map be + // nonempty, even if there's no real password, + secretData.insert(NM_OPENVPN_KEY_NOSECRET, ""); break; case 1: contype = NM_OPENVPN_CONTYPE_STATIC_KEY; ++++++ r1050784-activatable-sorting.diff ++++++ Index: libs/service/activatablelist.cpp =================================================================== --- libs/service/activatablelist.cpp (revision 1050783) +++ libs/service/activatablelist.cpp (revision 1050784) @@ -80,16 +80,21 @@ Q_D(ActivatableList); if (!d->activatables.contains(activatable)) { addActivatableInternal(activatable); + notifyOnAddActivatable(activatable); } } - void ActivatableList::addActivatableInternal(Knm::Activatable * activatable) { Q_D(ActivatableList); d->activatables.append(activatable); + connect(activatable, SIGNAL(changed()), this, SLOT(activatableChanged())); +} - connect(activatable, SIGNAL(changed()), this, SLOT(activatableChanged())); +void ActivatableList::notifyOnAddActivatable(Knm::Activatable * activatable) +{ + Q_D(ActivatableList); + foreach (ActivatableObserver * observer, d->observers) { observer->handleAdd(activatable); } Index: libs/service/activatablelist.h =================================================================== --- libs/service/activatablelist.h (revision 1050783) +++ libs/service/activatablelist.h (revision 1050784) @@ -61,6 +61,7 @@ void activatableChanged(); protected: void addActivatableInternal(Knm::Activatable * activatable); + void notifyOnAddActivatable(Knm::Activatable * activatable); ActivatableListPrivate * d_ptr; }; Index: libs/service/sortedactivatablelist.cpp =================================================================== --- libs/service/sortedactivatablelist.cpp (revision 1050783) +++ libs/service/sortedactivatablelist.cpp (revision 1050784) @@ -92,12 +92,11 @@ // add all vpn connections if ((iface && (d->types.testFlag(iface->type()))) || (activatable->activatableType() == Knm::Activatable::VpnInterfaceConnection)) { - addActivatableInternal(activatable); - + qSort(d->activatables.begin(), d->activatables.end(), activatableLessThan); + notifyOnAddActivatable(activatable); } } - qSort(d->activatables.begin(), d->activatables.end(), activatableLessThan); } void SortedActivatableList::handleUpdate(Knm::Activatable *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-FileHandle-Unget for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package perl-FileHandle-Unget for openSUSE:Factory checked in at Fri Nov 27 15:56:41 CET 2009. -------- --- perl-FileHandle-Unget/perl-FileHandle-Unget.changes 2008-07-25 16:39:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-FileHandle-Unget/perl-FileHandle-Unget.changes 2009-09-07 15:06:37.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 7 15:05:59 CEST 2009 - mls(a)suse.de + +- update to 0.1623 to make it build with perl-5.10.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- FileHandle-Unget-0.1622.tar.bz2 New: ---- FileHandle-Unget-0.1623.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-FileHandle-Unget.spec ++++++ --- /var/tmp/diff_new_pack.SaO71i/_old 2009-11-27 15:56:05.000000000 +0100 +++ /var/tmp/diff_new_pack.SaO71i/_new 2009-11-27 15:56:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-FileHandle-Unget (Version 0.1622) +# spec file for package perl-FileHandle-Unget (Version 0.1623) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,10 +20,10 @@ Name: perl-FileHandle-Unget BuildRequires: perl-Weakref -Version: 0.1622 -Release: 21 +Version: 0.1623 +Release: 1 Summary: Perl module for creating a FileHandle which supports ungetting of multiple bytes -License: GPL v2 or later +License: GPLv2+ Url: http://sourceforge.net/projects/fh-unget/ Group: Development/Libraries/Perl Requires: perl-Weakref ++++++ FileHandle-Unget-0.1622.tar.bz2 -> FileHandle-Unget-0.1623.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/CHANGES new/FileHandle-Unget-0.1623/CHANGES --- old/FileHandle-Unget-0.1622/CHANGES 2008-07-17 03:07:27.000000000 +0200 +++ new/FileHandle-Unget-0.1623/CHANGES 2009-08-09 23:10:32.000000000 +0200 @@ -1,3 +1,10 @@ +Version 0.1623: Sun Aug 9 2009 +- Fixed a bug where files with binary data would sometimes cause an + unitialized value warning at line 394 as well as incorrect behavior. (Thanks + to Bill Nugent <whn(a)lopi.com> for the bug report and initial patch.) +- Removed unused ExtUtils::MakeMaker::bytes, which doesn't exist anymore + anyway. (Thanks to Slaven Rezić <srezic(a)cpan.org> for the bug report.) + Version 0.1622: Wed Jul 16 2008 - Updated to the latest version of Module::Install - Removed auto-install for better compatibility with CPAN and others diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/inc/Module/Install/Base.pm new/FileHandle-Unget-0.1623/inc/Module/Install/Base.pm --- old/FileHandle-Unget-0.1622/inc/Module/Install/Base.pm 2008-07-17 03:07:51.000000000 +0200 +++ new/FileHandle-Unget-0.1623/inc/Module/Install/Base.pm 2009-08-30 20:08:05.000000000 +0200 @@ -1,7 +1,11 @@ #line 1 package Module::Install::Base; -$VERSION = '0.75'; +use strict 'vars'; +use vars qw{$VERSION}; +BEGIN { + $VERSION = '0.91'; +} # Suspend handler for "redefined" warnings BEGIN { @@ -9,52 +13,56 @@ $SIG{__WARN__} = sub { $w }; } -### This is the ONLY module that shouldn't have strict on -# use strict; - -#line 41 +#line 42 sub new { - my ($class, %args) = @_; - - foreach my $method ( qw(call load) ) { - *{"$class\::$method"} = sub { - shift()->_top->$method(@_); - } unless defined &{"$class\::$method"}; - } - - bless( \%args, $class ); + my $class = shift; + unless ( defined &{"${class}::call"} ) { + *{"${class}::call"} = sub { shift->_top->call(@_) }; + } + unless ( defined &{"${class}::load"} ) { + *{"${class}::load"} = sub { shift->_top->load(@_) }; + } + bless { @_ }, $class; } #line 61 sub AUTOLOAD { - my $self = shift; - local $@; - my $autoload = eval { $self->_top->autoload } or return; - goto &$autoload; + local $@; + my $func = eval { shift->_top->autoload } or return; + goto &$func; } -#line 76 +#line 75 -sub _top { $_[0]->{_top} } +sub _top { + $_[0]->{_top}; +} -#line 89 +#line 90 sub admin { - $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new; + $_[0]->_top->{admin} + or + Module::Install::Base::FakeAdmin->new; } +#line 106 + sub is_admin { - $_[0]->admin->VERSION; + $_[0]->admin->VERSION; } sub DESTROY {} package Module::Install::Base::FakeAdmin; -my $Fake; -sub new { $Fake ||= bless(\@_, $_[0]) } +my $fake; + +sub new { + $fake ||= bless(\@_, $_[0]); +} sub AUTOLOAD {} @@ -67,4 +75,4 @@ 1; -#line 138 +#line 154 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/inc/Module/Install/Can.pm new/FileHandle-Unget-0.1623/inc/Module/Install/Can.pm --- old/FileHandle-Unget-0.1622/inc/Module/Install/Can.pm 2008-07-17 03:07:51.000000000 +0200 +++ new/FileHandle-Unget-0.1623/inc/Module/Install/Can.pm 2009-08-30 20:08:05.000000000 +0200 @@ -2,18 +2,16 @@ package Module::Install::Can; use strict; -use Module::Install::Base; -use Config (); -### This adds a 5.005 Perl version dependency. -### This is a bug and will be fixed. -use File::Spec (); -use ExtUtils::MakeMaker (); +use Config (); +use File::Spec (); +use ExtUtils::MakeMaker (); +use Module::Install::Base (); -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.75'; + $VERSION = '0.91'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; - @ISA = qw{Module::Install::Base}; } # check if we can load some module @@ -39,6 +37,7 @@ return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { + next if $dir eq ''; my $abs = File::Spec->catfile($dir, $_[1]); return $abs if (-x $abs or $abs = MM->maybe_command($abs)); } @@ -79,4 +78,4 @@ __END__ -#line 157 +#line 156 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/inc/Module/Install/Fetch.pm new/FileHandle-Unget-0.1623/inc/Module/Install/Fetch.pm --- old/FileHandle-Unget-0.1622/inc/Module/Install/Fetch.pm 2008-07-17 03:07:51.000000000 +0200 +++ new/FileHandle-Unget-0.1623/inc/Module/Install/Fetch.pm 2009-08-30 20:08:05.000000000 +0200 @@ -2,24 +2,24 @@ package Module::Install::Fetch; use strict; -use Module::Install::Base; +use Module::Install::Base (); -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.75'; + $VERSION = '0.91'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; - @ISA = qw{Module::Install::Base}; } sub get_file { my ($self, %args) = @_; - my ($scheme, $host, $path, $file) = + my ($scheme, $host, $path, $file) = $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { $args{url} = $args{ftp_url} or (warn("LWP support unavailable!\n"), return); - ($scheme, $host, $path, $file) = + ($scheme, $host, $path, $file) = $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/inc/Module/Install/Makefile.pm new/FileHandle-Unget-0.1623/inc/Module/Install/Makefile.pm --- old/FileHandle-Unget-0.1622/inc/Module/Install/Makefile.pm 2008-07-17 03:07:51.000000000 +0200 +++ new/FileHandle-Unget-0.1623/inc/Module/Install/Makefile.pm 2009-08-30 20:08:05.000000000 +0200 @@ -2,14 +2,14 @@ package Module::Install::Makefile; use strict 'vars'; -use Module::Install::Base; -use ExtUtils::MakeMaker (); +use ExtUtils::MakeMaker (); +use Module::Install::Base (); -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.75'; + $VERSION = '0.91'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; - @ISA = qw{Module::Install::Base}; } sub Makefile { $_[0] } @@ -36,9 +36,9 @@ sub makemaker_args { my $self = shift; - my $args = ($self->{makemaker_args} ||= {}); - %$args = ( %$args, @_ ) if @_; - $args; + my $args = ( $self->{makemaker_args} ||= {} ); + %$args = ( %$args, @_ ); + return $args; } # For mm args that take multiple space-seperated args, @@ -64,7 +64,7 @@ my $self = shift; my $clean = $self->makemaker_args->{clean} ||= {}; %$clean = ( - %$clean, + %$clean, FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), ); } @@ -73,7 +73,7 @@ my $self = shift; my $realclean = $self->makemaker_args->{realclean} ||= {}; %$realclean = ( - %$realclean, + %$realclean, FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), ); } @@ -114,11 +114,32 @@ my $self = shift; die "&Makefile->write() takes no arguments\n" if @_; - # Make sure we have a new enough + # Check the current Perl version + my $perl_version = $self->perl_version; + if ( $perl_version ) { + eval "use $perl_version; 1" + or die "ERROR: perl: Version $] is installed, " + . "but we need version >= $perl_version"; + } + + # Make sure we have a new enough MakeMaker require ExtUtils::MakeMaker; - $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION ); - # Generate the + if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { + # MakeMaker can complain about module versions that include + # an underscore, even though its own version may contain one! + # Hence the funny regexp to get rid of it. See RT #35800 + # for details. + $self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); + $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); + } else { + # Allow legacy-compatibility with 5.005 by depending on the + # most recent EU:MM that supported 5.005. + $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 ); + } + + # Generate the MakeMaker params my $args = $self->makemaker_args; $args->{DISTNAME} = $self->name; $args->{NAME} = $self->module_name || $self->name; @@ -127,7 +148,7 @@ if ( $self->tests ) { $args->{test} = { TESTS => $self->tests }; } - if ($] >= 5.005) { + if ( $] >= 5.005 ) { $args->{ABSTRACT} = $self->abstract; $args->{AUTHOR} = $self->author; } @@ -141,7 +162,7 @@ delete $args->{SIGN}; } - # merge both kinds of requires into prereq_pm + # Merge both kinds of requires into prereq_pm my $prereq = ($args->{PREREQ_PM} ||= {}); %$prereq = ( %$prereq, map { @$_ } @@ -175,7 +196,9 @@ my $user_preop = delete $args{dist}->{PREOP}; if (my $preop = $self->admin->preop($user_preop)) { - $args{dist} = $preop; + foreach my $key ( keys %$preop ) { + $args{dist}->{$key} = $preop->{$key}; + } } my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); @@ -188,7 +211,7 @@ my $top_class = ref($self->_top) || ''; my $top_version = $self->_top->VERSION || ''; - my $preamble = $self->preamble + my $preamble = $self->preamble ? "# Preamble by $top_class $top_version\n" . $self->preamble : ''; @@ -242,4 +265,4 @@ __END__ -#line 371 +#line 394 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/inc/Module/Install/Metadata.pm new/FileHandle-Unget-0.1623/inc/Module/Install/Metadata.pm --- old/FileHandle-Unget-0.1622/inc/Module/Install/Metadata.pm 2008-07-17 03:07:51.000000000 +0200 +++ new/FileHandle-Unget-0.1623/inc/Module/Install/Metadata.pm 2009-08-30 20:08:05.000000000 +0200 @@ -2,24 +2,26 @@ package Module::Install::Metadata; use strict 'vars'; -use Module::Install::Base; +use Module::Install::Base (); -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.75'; + $VERSION = '0.91'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; - @ISA = qw{Module::Install::Base}; } +my @boolean_keys = qw{ + sign +}; + my @scalar_keys = qw{ name module_name abstract author version - license distribution_type - perl_version tests installdirs }; @@ -33,123 +35,199 @@ resources }; -sub Meta { shift } -sub Meta_ScalarKeys { @scalar_keys } -sub Meta_TupleKeys { @tuple_keys } +my @resource_keys = qw{ + homepage + bugtracker + repository +}; + +my @array_keys = qw{ + keywords +}; + +sub Meta { shift } +sub Meta_BooleanKeys { @boolean_keys } +sub Meta_ScalarKeys { @scalar_keys } +sub Meta_TupleKeys { @tuple_keys } +sub Meta_ResourceKeys { @resource_keys } +sub Meta_ArrayKeys { @array_keys } -foreach my $key (@scalar_keys) { +foreach my $key ( @boolean_keys ) { *$key = sub { my $self = shift; - return $self->{values}{$key} if defined wantarray and !@_; - $self->{values}{$key} = shift; + if ( defined wantarray and not @_ ) { + return $self->{values}->{$key}; + } + $self->{values}->{$key} = ( @_ ? $_[0] : 1 ); return $self; }; } -sub requires { - my $self = shift; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @{ $self->{values}->{requires} }, [ $module, $version ]; - } - $self->{values}{requires}; -} - -sub build_requires { - my $self = shift; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @{ $self->{values}->{build_requires} }, [ $module, $version ]; - } - $self->{values}{build_requires}; +foreach my $key ( @scalar_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} if defined wantarray and !@_; + $self->{values}->{$key} = shift; + return $self; + }; } -sub configure_requires { - my $self = shift; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @{ $self->{values}->{configure_requires} }, [ $module, $version ]; - } - $self->{values}->{configure_requires}; +foreach my $key ( @array_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} if defined wantarray and !@_; + $self->{values}->{$key} ||= []; + push @{$self->{values}->{$key}}, @_; + return $self; + }; } -sub recommends { - my $self = shift; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @{ $self->{values}->{recommends} }, [ $module, $version ]; - } - $self->{values}->{recommends}; +foreach my $key ( @resource_keys ) { + *$key = sub { + my $self = shift; + unless ( @_ ) { + return () unless $self->{values}->{resources}; + return map { $_->[1] } + grep { $_->[0] eq $key } + @{ $self->{values}->{resources} }; + } + return $self->{values}->{resources}->{$key} unless @_; + my $uri = shift or die( + "Did not provide a value to $key()" + ); + $self->resources( $key => $uri ); + return 1; + }; } -sub bundles { - my $self = shift; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @{ $self->{values}->{bundles} }, [ $module, $version ]; - } - $self->{values}->{bundles}; +foreach my $key ( grep { $_ ne "resources" } @tuple_keys) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} unless @_; + my @added; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @added, [ $module, $version ]; + } + push @{ $self->{values}->{$key} }, @added; + return map {@$_} @added; + }; } # Resource handling +my %lc_resource = map { $_ => 1 } qw{ + homepage + license + bugtracker + repository +}; + sub resources { my $self = shift; while ( @_ ) { - my $resource = shift or last; - my $value = shift or next; - push @{ $self->{values}->{resources} }, [ $resource, $value ]; + my $name = shift or last; + my $value = shift or next; + if ( $name eq lc $name and ! $lc_resource{$name} ) { + die("Unsupported reserved lowercase resource '$name'"); + } + $self->{values}->{resources} ||= []; + push @{ $self->{values}->{resources} }, [ $name, $value ]; } $self->{values}->{resources}; } -sub repository { - my $self = shift; - $self->resources( repository => shift ); - return 1; -} - # Aliases for build_requires that will have alternative # meanings in some future version of META.yml. -sub test_requires { shift->build_requires(@_) } -sub install_requires { shift->build_requires(@_) } +sub test_requires { shift->build_requires(@_) } +sub install_requires { shift->build_requires(@_) } # Aliases for installdirs options -sub install_as_core { $_[0]->installdirs('perl') } -sub install_as_cpan { $_[0]->installdirs('site') } -sub install_as_site { $_[0]->installdirs('site') } -sub install_as_vendor { $_[0]->installdirs('vendor') } - -sub sign { - my $self = shift; - return $self->{'values'}{'sign'} if defined wantarray and ! @_; - $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 ); - return $self; -} +sub install_as_core { $_[0]->installdirs('perl') } +sub install_as_cpan { $_[0]->installdirs('site') } +sub install_as_site { $_[0]->installdirs('site') } +sub install_as_vendor { $_[0]->installdirs('vendor') } sub dynamic_config { my $self = shift; unless ( @_ ) { - warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n"; + warn "You MUST provide an explicit true/false value to dynamic_config\n"; return $self; } - $self->{values}{dynamic_config} = $_[0] ? 1 : 0; - return $self; + $self->{values}->{dynamic_config} = $_[0] ? 1 : 0; + return 1; +} + +sub perl_version { + my $self = shift; + return $self->{values}->{perl_version} unless @_; + my $version = shift or die( + "Did not provide a value to perl_version()" + ); + + # Normalize the version + $version = $self->_perl_version($version); + + # We don't support the reall old versions + unless ( $version >= 5.005 ) { + die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; + } + + $self->{values}->{perl_version} = $version; +} + +#Stolen from M::B +my %license_urls = ( + perl => 'http://dev.perl.org/licenses/', + apache => 'http://apache.org/licenses/LICENSE-2.0', + artistic => 'http://opensource.org/licenses/artistic-license.php', + artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', + lgpl => 'http://opensource.org/licenses/lgpl-license.php', + lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', + lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', + bsd => 'http://opensource.org/licenses/bsd-license.php', + gpl => 'http://opensource.org/licenses/gpl-license.php', + gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', + gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', + mit => 'http://opensource.org/licenses/mit-license.php', + mozilla => 'http://opensource.org/licenses/mozilla1.1.php', + open_source => undef, + unrestricted => undef, + restrictive => undef, + unknown => undef, +); + +sub license { + my $self = shift; + return $self->{values}->{license} unless @_; + my $license = shift or die( + 'Did not provide a value to license()' + ); + $self->{values}->{license} = $license; + + # Automatically fill in license URLs + if ( $license_urls{$license} ) { + $self->resources( license => $license_urls{$license} ); + } + + return 1; } sub all_from { my ( $self, $file ) = @_; unless ( defined($file) ) { - my $name = $self->name - or die "all_from called with no args without setting name() first"; + my $name = $self->name or die( + "all_from called with no args without setting name() first" + ); $file = join('/', 'lib', split(/-/, $name)) . '.pm'; $file =~ s{.*/}{} unless -e $file; - die "all_from: cannot find $file from $name" unless -e $file; + unless ( -e $file ) { + die("all_from cannot find $file from $name"); + } + } + unless ( -f $file ) { + die("The path '$file' does not exist, or is not a file"); } # Some methods pull from POD instead of code. @@ -171,7 +249,7 @@ sub provides { my $self = shift; - my $provides = ( $self->{values}{provides} ||= {} ); + my $provides = ( $self->{values}->{provides} ||= {} ); %$provides = (%$provides, @_) if @_; return $provides; } @@ -200,7 +278,7 @@ sub feature { my $self = shift; my $name = shift; - my $features = ( $self->{values}{features} ||= [] ); + my $features = ( $self->{values}->{features} ||= [] ); my $mods; if ( @_ == 1 and ref( $_[0] ) ) { @@ -236,8 +314,8 @@ sub no_index { my $self = shift; my $type = shift; - push @{ $self->{values}{no_index}{$type} }, @_ if $type; - return $self->{values}{no_index}; + push @{ $self->{values}->{no_index}->{$type} }, @_ if $type; + return $self->{values}->{no_index}; } sub read { @@ -303,7 +381,7 @@ $self->module_name($module_name); } } else { - die "Cannot determine name from $file\n"; + die("Cannot determine name from $file\n"); } } @@ -361,24 +439,25 @@ /ixms ) { my $license_text = $1; my @phrases = ( - 'under the same (?:terms|license) as perl itself' => 'perl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'BSD license' => 'bsd', 1, - 'Artistic license' => 'artistic', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'proprietary' => 'proprietary', 0, + 'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1, + 'GNU general public license' => 'gpl', 1, + 'GNU public license' => 'gpl', 1, + 'GNU lesser general public license' => 'lgpl', 1, + 'GNU lesser public license' => 'lgpl', 1, + 'GNU library general public license' => 'lgpl', 1, + 'GNU library public license' => 'lgpl', 1, + 'BSD license' => 'bsd', 1, + 'Artistic license' => 'artistic', 1, + 'GPL' => 'gpl', 1, + 'LGPL' => 'lgpl', 1, + 'BSD' => 'bsd', 1, + 'Artistic' => 'artistic', 1, + 'MIT' => 'mit', 1, + 'proprietary' => 'proprietary', 0, ); while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { $pattern =~ s{\s+}{\\s+}g; if ( $license_text =~ /\b$pattern\b/i ) { - if ( $osi and $license_text =~ /All rights reserved/i ) { - print "WARNING: 'All rights reserved' in copyright may invalidate Open Source license.\n"; - } $self->license($license); return 1; } @@ -389,19 +468,157 @@ return 'unknown'; } -sub install_script { +sub _extract_bugtracker { + my @links = $_[0] =~ m#L<(\Qhttp://rt.cpan.org/\E[^>]+)>#g; + my %links; + @links{@links}=(); + @links=keys %links; + return @links; +} + +sub bugtracker_from { + my $self = shift; + my $content = Module::Install::_read($_[0]); + my @links = _extract_bugtracker($content); + unless ( @links ) { + warn "Cannot determine bugtracker info from $_[0]\n"; + return 0; + } + if ( @links > 1 ) { + warn "Found more than on rt.cpan.org link in $_[0]\n"; + return 0; + } + + # Set the bugtracker + bugtracker( $links[0] ); + return 1; +} + +sub requires_from { + my $self = shift; + my $content = Module::Install::_readperl($_[0]); + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; + while ( @requires ) { + my $module = shift @requires; + my $version = shift @requires; + $self->requires( $module => $version ); + } +} + +sub test_requires_from { + my $self = shift; + my $content = Module::Install::_readperl($_[0]); + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; + while ( @requires ) { + my $module = shift @requires; + my $version = shift @requires; + $self->test_requires( $module => $version ); + } +} + +# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to +# numbers (eg, 5.006001 or 5.008009). +# Also, convert double-part versions (eg, 5.8) +sub _perl_version { + my $v = $_[-1]; + $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; + $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; + $v =~ s/(\.\d\d\d)000$/$1/; + $v =~ s/_.+$//; + if ( ref($v) ) { + # Numify + $v = $v + 0; + } + return $v; +} + + + + + +###################################################################### +# MYMETA Support + +sub WriteMyMeta { + die "WriteMyMeta has been deprecated"; +} + +sub write_mymeta_yaml { my $self = shift; - my $args = $self->makemaker_args; - my $exe = $args->{EXE_FILES} ||= []; - foreach ( @_ ) { - if ( -f $_ ) { - push @$exe, $_; - } elsif ( -d 'script' and -f "script/$_" ) { - push @$exe, "script/$_"; - } else { - die "Cannot find script '$_'"; + + # We need YAML::Tiny to write the MYMETA.yml file + unless ( eval { require YAML::Tiny; 1; } ) { + return 1; + } + + # Generate the data + my $meta = $self->_write_mymeta_data or return 1; + + # Save as the MYMETA.yml file + print "Writing MYMETA.yml\n"; + YAML::Tiny::DumpFile('MYMETA.yml', $meta); +} + +sub write_mymeta_json { + my $self = shift; + + # We need JSON to write the MYMETA.json file + unless ( eval { require JSON; 1; } ) { + return 1; + } + + # Generate the data + my $meta = $self->_write_mymeta_data or return 1; + + # Save as the MYMETA.yml file + print "Writing MYMETA.json\n"; + Module::Install::_write( + 'MYMETA.json', + JSON->new->pretty(1)->canonical->encode($meta), + ); +} + +sub _write_mymeta_data { + my $self = shift; + + # If there's no existing META.yml there is nothing we can do + return undef unless -f 'META.yml'; + + # We need Parse::CPAN::Meta to load the file + unless ( eval { require Parse::CPAN::Meta; 1; } ) { + return undef; + } + + # Merge the perl version into the dependencies + my $val = $self->Meta->{values}; + my $perl = delete $val->{perl_version}; + if ( $perl ) { + $val->{requires} ||= []; + my $requires = $val->{requires}; + + # Canonize to three-dot version after Perl 5.6 + if ( $perl >= 5.006 ) { + $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e } + unshift @$requires, [ perl => $perl ]; } + + # Load the advisory META.yml file + my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); + my $meta = $yaml[0]; + + # Overwrite the non-configure dependency hashs + delete $meta->{requires}; + delete $meta->{build_requires}; + delete $meta->{recommends}; + if ( exists $val->{requires} ) { + $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; + } + if ( exists $val->{build_requires} ) { + $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; + } + + return $meta; } 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/inc/Module/Install/Win32.pm new/FileHandle-Unget-0.1623/inc/Module/Install/Win32.pm --- old/FileHandle-Unget-0.1622/inc/Module/Install/Win32.pm 2008-07-17 03:07:51.000000000 +0200 +++ new/FileHandle-Unget-0.1623/inc/Module/Install/Win32.pm 2009-08-30 20:08:05.000000000 +0200 @@ -2,12 +2,12 @@ package Module::Install::Win32; use strict; -use Module::Install::Base; +use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.75'; - @ISA = qw{Module::Install::Base}; + $VERSION = '0.91'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/inc/Module/Install/WriteAll.pm new/FileHandle-Unget-0.1623/inc/Module/Install/WriteAll.pm --- old/FileHandle-Unget-0.1622/inc/Module/Install/WriteAll.pm 2008-07-17 03:07:51.000000000 +0200 +++ new/FileHandle-Unget-0.1623/inc/Module/Install/WriteAll.pm 2009-08-30 20:08:05.000000000 +0200 @@ -2,11 +2,11 @@ package Module::Install::WriteAll; use strict; -use Module::Install::Base; +use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.75'; + $VERSION = '0.91';; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } @@ -22,7 +22,6 @@ ); $self->sign(1) if $args{sign}; - $self->Meta->write if $args{meta}; $self->admin->WriteAll(%args) if $self->is_admin; $self->check_nmake if $args{check_nmake}; @@ -30,11 +29,32 @@ $self->makemaker_args( PL_FILES => {} ); } + # Until ExtUtils::MakeMaker support MYMETA.yml, make sure + # we clean it up properly ourself. + $self->realclean_files('MYMETA.yml'); + if ( $args{inline} ) { $self->Inline->write; } else { $self->Makefile->write; } + + # The Makefile write process adds a couple of dependencies, + # so write the META.yml files after the Makefile. + if ( $args{meta} ) { + $self->Meta->write; + } + + # Experimental support for MYMETA + if ( $ENV{X_MYMETA} ) { + if ( $ENV{X_MYMETA} eq 'JSON' ) { + $self->Meta->write_mymeta_json; + } else { + $self->Meta->write_mymeta_yaml; + } + } + + return 1; } 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/inc/Module/Install.pm new/FileHandle-Unget-0.1623/inc/Module/Install.pm --- old/FileHandle-Unget-0.1622/inc/Module/Install.pm 2008-07-17 03:07:51.000000000 +0200 +++ new/FileHandle-Unget-0.1623/inc/Module/Install.pm 2009-08-30 20:08:04.000000000 +0200 @@ -17,12 +17,10 @@ # 3. The ./inc/ version of Module::Install loads # } -BEGIN { - require 5.004; -} +use 5.005; use strict 'vars'; -use vars qw{$VERSION}; +use vars qw{$VERSION $MAIN}; BEGIN { # All Module::Install core packages now require synchronised versions. # This will be used to ensure we don't accidentally load old or @@ -30,7 +28,10 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '0.75'; + $VERSION = '0.91'; + + # Storage for the pseudo-singleton + $MAIN = undef; *inc::Module::Install::VERSION = *VERSION; @inc::Module::Install::ISA = __PACKAGE__; @@ -69,15 +70,26 @@ # again. This is bad. Rather than taking action to touch it (which # is unreliable on some platforms and requires write permissions) # for now we should catch this and refuse to run. -if ( -f $0 and (stat($0))[9] > time ) { die <<"END_DIE" } +if ( -f $0 ) { + my $s = (stat($0))[9]; -Your installer $0 has a modification time in the future. + # If the modification time is only slightly in the future, + # sleep briefly to remove the problem. + my $a = $s - time; + if ( $a > 0 and $a < 5 ) { sleep 5 } + + # Too far in the future, throw an error. + my $t = time; + if ( $s > $t ) { die <<"END_DIE" } + +Your installer $0 has a modification time in the future ($s > $t). This is known to create infinite loops in make. Please correct this, then run $0 again. END_DIE +} @@ -121,12 +133,22 @@ $sym->{$cwd} = sub { my $pwd = Cwd::cwd(); if ( my $code = $sym->{$pwd} ) { - # delegate back to parent dirs + # Delegate back to parent dirs goto &$code unless $cwd eq $pwd; } $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; + my $method = $1; + if ( uc($method) eq $method ) { + # Do nothing + return; + } elsif ( $method =~ /^_/ and $self->can($method) ) { + # Dispatch to the root M:I class + return $self->$method(@_); + } + + # Dispatch to the appropriate plugin unshift @_, ( $self, $1 ); - goto &{$self->can('call')} unless uc($1) eq $1; + goto &{$self->can('call')}; }; } @@ -151,6 +173,9 @@ delete $INC{"$self->{file}"}; delete $INC{"$self->{path}.pm"}; + # Save to the singleton + $MAIN = $self; + return 1; } @@ -164,8 +189,7 @@ my @exts = @{$self->{extensions}}; unless ( @exts ) { - my $admin = $self->{admin}; - @exts = $admin->load_all_extensions; + @exts = $self->{admin}->load_all_extensions; } my %seen; @@ -248,7 +272,7 @@ sub load_extensions { my ($self, $path, $top) = @_; - unless ( grep { lc $_ eq lc $self->{prefix} } @INC ) { + unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { unshift @INC, $self->{prefix}; } @@ -312,7 +336,7 @@ ##################################################################### -# Utility Functions +# Common Utility Functions sub _caller { my $depth = 0; @@ -326,28 +350,81 @@ sub _read { local *FH; - open FH, "< $_[0]" or die "open($_[0]): $!"; - my $str = do { local $/; <FH> }; + if ( $] >= 5.006 ) { + open( FH, '<', $_[0] ) or die "open($_[0]): $!"; + } else { + open( FH, "< $_[0]" ) or die "open($_[0]): $!"; + } + my $string = do { local $/; <FH> }; close FH or die "close($_[0]): $!"; - return $str; + return $string; +} + +sub _readperl { + my $string = Module::Install::_read($_[0]); + $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; + $string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s; + $string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg; + return $string; +} + +sub _readpod { + my $string = Module::Install::_read($_[0]); + $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; + return $string if $_[0] =~ /\.pod\z/; + $string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg; + $string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg; + $string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg; + $string =~ s/^\n+//s; + return $string; } sub _write { local *FH; - open FH, "> $_[0]" or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { print FH $_[$_] or die "print($_[0]): $!" } + if ( $] >= 5.006 ) { + open( FH, '>', $_[0] ) or die "open($_[0]): $!"; + } else { + open( FH, "> $_[0]" ) or die "open($_[0]): $!"; + } + foreach ( 1 .. $#_ ) { + print FH $_[$_] or die "print($_[0]): $!"; + } close FH or die "close($_[0]): $!"; } -sub _version { +# _version is for processing module versions (eg, 1.03_05) not +# Perl versions (eg, 5.8.1). +sub _version ($) { my $s = shift || 0; - $s =~ s/^(\d+)\.?//; + my $d =()= $s =~ /(\.)/g; + if ( $d >= 2 ) { + # Normalise multipart versions + $s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg; + } + $s =~ s/^(\d+)\.?//; my $l = $1 || 0; - my @v = map { $_ . '0' x (3 - length $_) } $s =~ /(\d{1,3})\D?/g; - $l = $l . '.' . join '', @v if @v; + my @v = map { + $_ . '0' x (3 - length $_) + } $s =~ /(\d{1,3})\D?/g; + $l = $l . '.' . join '', @v if @v; return $l + 0; } +sub _cmp ($$) { + _version($_[0]) <=> _version($_[1]); +} + +# Cloned from Params::Util::_CLASS +sub _CLASS ($) { + ( + defined $_[0] + and + ! ref $_[0] + and + $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s + ) ? $_[0] : undef; +} + 1; -# Copyright 2008 Adam Kennedy. +# Copyright 2008 - 2009 Adam Kennedy. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/lib/FileHandle/Unget.pm new/FileHandle-Unget-0.1623/lib/FileHandle/Unget.pm --- old/FileHandle-Unget-0.1622/lib/FileHandle/Unget.pm 2008-07-17 03:07:16.000000000 +0200 +++ new/FileHandle-Unget-0.1623/lib/FileHandle/Unget.pm 2009-08-09 23:12:04.000000000 +0200 @@ -4,16 +4,15 @@ use Symbol; use FileHandle; use Exporter; -use ExtUtils::MakeMaker::bytes; use Scalar::Util qw( weaken ); -use 5.000; +use 5.005; use vars qw( @ISA $VERSION $AUTOLOAD @EXPORT @EXPORT_OK ); @ISA = qw( Exporter FileHandle ); -$VERSION = sprintf "%d.%02d%02d", q/0.16.22/ =~ /(\d+)/g; +$VERSION = sprintf "%d.%02d%02d", q/0.16.23/ =~ /(\d+)/g; @EXPORT = @FileHandle::EXPORT; @EXPORT_OK = @FileHandle::EXPORT_OK; @@ -389,7 +388,7 @@ { $line = undef; } - else + elsif (defined $templine) { $line .= $templine; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/META.yml new/FileHandle-Unget-0.1623/META.yml --- old/FileHandle-Unget-0.1622/META.yml 2008-07-15 14:02:59.000000000 +0200 +++ new/FileHandle-Unget-0.1623/META.yml 2009-08-30 20:08:05.000000000 +0200 @@ -1,10 +1,28 @@ -#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# -name: FileHandle-Unget -version: 0.15 -version_from: lib/FileHandle/Unget.pm -installdirs: site -requires: - Scalar::Util: 0 - +--- +abstract: 'FileHandle which supports multi-byte unget' +author: + - 'David Coppit <david(a)coppit.org>.' +build_requires: + ExtUtils::MakeMaker: 6.42 + File::Spec::Functions: 0 + Test::More: 0 +configure_requires: + ExtUtils::MakeMaker: 6.42 distribution_type: module -generated_by: ExtUtils::MakeMaker version 6.12 +generated_by: 'Module::Install version 0.91' +license: gpl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +module_name: FileHandle::Unget +name: FileHandle-Unget +no_index: + directory: + - inc + - t +requires: + Scalar::Util: 1.14 + perl: 5.005 +resources: + license: http://opensource.org/licenses/gpl-license.php +version: 0.1623 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FileHandle-Unget-0.1622/README new/FileHandle-Unget-0.1623/README --- old/FileHandle-Unget-0.1622/README 2008-07-16 05:15:04.000000000 +0200 +++ new/FileHandle-Unget-0.1623/README 2009-08-12 13:59:04.000000000 +0200 @@ -76,7 +76,7 @@ HOMEPAGE The CPAN Page: -http://search.cpan.org/~dcoppit/FileHandle-Unget/ +http://search.cpan.org/dist/FileHandle-Unget/ The Google Code page: http://code.google.com/p/filehandle-unget/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit skelcd-control-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at Fri Nov 27 15:55:48 CET 2009. -------- --- skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2009-11-06 12:21:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2009-11-24 16:52:36.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 24 16:58:22 CET 2009 - kmachalkova(a)suse.cz + +- New variable in globals: run_init_scripts_in_parallel, to set + /etc/sysconfig/boot:RUN_PARALLEL (FaTE#307555) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.w02hth/_old 2009-11-27 15:52:51.000000000 +0100 +++ /var/tmp/diff_new_pack.w02hth/_new 2009-11-27 15:52:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-control-openSUSE (Version 2009.11.6) +# spec file for package skelcd-control-openSUSE (Version 2009.11.24) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,13 +20,13 @@ Name: skelcd-control-openSUSE BuildRequires: libxml2 -# Contains the new control.rng (unique ids) -BuildRequires: yast2-installation >= 2.18.24 +# new global option - FaTE#307555 +BuildRequires: yast2-installation >= 2.19.0 Url: http://www.suse.com/ -License: YaST License +License: YaST Group: Metapackages AutoReqProv: off -Version: 2009.11.6 +Version: 2009.11.24 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ control.xml ++++++ --- skelcd-control-openSUSE/control.xml 2009-11-06 12:21:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/skelcd-control-openSUSE/control.xml 2009-11-24 16:52:36.000000000 +0100 @@ -17,6 +17,8 @@  <write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts> +  + <run_init_scripts_in_parallel config:type="boolean">true</run_init_scripts_in_parallel> <incomplete_translation_treshold>95</incomplete_translation_treshold> <inform_about_suboptimal_distribution config:type="boolean">true</inform_about_suboptimal_distribution> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0