September 2011 - openSUSE Commits - openSUSE Mailing Lists

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '11

01 Sep '11

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Thu Sep 1 13:33:26 CEST 2011. -------- --- Mesa/Mesa.changes 2011-07-28 09:16:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2011-08-09 02:55:34.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Aug 9 00:51:28 UTC 2011 - stefan.bruens(a)rwth-aachen.de + +- add fix for bfo #28125 (DRI2 prevents indirect glx) + +------------------------------------------------------------------- +Tue Aug 2 13:05:58 UTC 2011 - mhopf(a)novell.com + +- Obsolete Mesa-nouveau3d (included in standard Mesa package now) +- Also nuke from baselibs.conf + +------------------------------------------------------------------- +Fri Jul 29 10:10:31 UTC 2011 - mhopf(a)novell.com + +- Update to Mesa 7.11-rc3 +- U_Mesa-7.11-llvm3.patch: fix compatibility with llvm 3.0 (and pre-releases) +- gallium is now required for r300, r600 +- nouveau is now built by default (except on < OS11.3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MesaLib-7.10.3.tar.bz2 egl-buildfix.diff libdrm-2.4.26-nouveau.diff New: ---- MesaLib-7.11-rc3.tar.bz2 U_Mesa-7.11-llvm3.patch U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.TbKdLq/_old 2011-09-01 12:10:06.000000000 +0200 +++ /var/tmp/diff_new_pack.TbKdLq/_new 2011-09-01 12:10:06.000000000 +0200 @@ -17,25 +17,20 @@ # norootforbuild -%define enable_nouveau_gallium 1 -%define enable_radeon_gallium 1 +%define _version 7.11-rc3 -%define _version 7.10.3 - -Version: 7.10.3 -Release: 14 +Version: 7.11 +Release: 1 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel -BuildRequires: bison flex libtalloc-devel libxml2-python -%if 0%{?suse_version} > 1020 -BuildRequires: fdupes -%endif +BuildRequires: bison fdupes flex libtalloc-devel libxml2-python llvm-devel Url: http://www.mesa3d.org License: MIT License (or similar) Group: System/Libraries Provides: xorg-x11-Mesa = %{version} intel-i810-Mesa = %{version} Mesa7 = %{version} Obsoletes: xorg-x11-Mesa < %{version} intel-i810-Mesa < %{version} Mesa7 < %{version} +Obsoletes: Mesa-nouveau3d AutoReqProv: on # bug437293 %ifarch ppc64 @@ -50,11 +45,11 @@ Source4: manual-pages.tar.bz2 Source5: drirc # to be upstreamed -Patch8: egl-buildfix.diff Patch9: u_GLX-SWrast-Make-GLX-with-SWrast-enabled-work-on-olde.patch Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch -Patch12: libdrm-2.4.26-nouveau.diff # already upstream +Patch13: U_Mesa-7.11-llvm3.patch +Patch14: U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -113,26 +108,6 @@ -------- Brian Paul -%package nouveau3d -License: MIT License (or similar) -Requires: Mesa = %version xorg-x11-driver-video-nouveau -Summary: Experimental 3D driver for nouveau driver -Group: System/Libraries - -%description nouveau3d -This is the 3D driver for open source nouveau driver. It uses Gallium3d architecture within Mesa. - -Note: -This driver is in a very experimental state. So it is not recommend that you use it. -Bug reports using this driver are not supported by developers. - -Authors: --------- - Brian Paul - Pekka Paalanen - Ben Skeggs - Francisco Jerez - %prep %setup -n %{name}-%{_version} -b4 -q # no need to build (GLUT-)Demos @@ -141,10 +116,10 @@ rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h} # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch8 %patch9 -p1 %patch11 -p1 -%patch12 -p1 +%patch13 -p0 +%patch14 -p1 %build @@ -155,38 +130,29 @@ autoreconf -fi ### libGL (disable savage/mga, bnc #402132/#403071; reenable mga, bnc #466635) %configure --disable-glw \ + --enable-gles1 \ --enable-gles2 \ --with-driver=dri \ --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \ %ifarch %ix86 x86_64 + --with-dri-drivers=i810,i915,i965,mach64,r128,r200,radeon,sis,tdfx,unichrome,swrast,mga \ %if 0%{?suse_version} >= 1130 - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast,nouveau,mga \ + --with-gallium-drivers=r300,r600,nouveau \ %else - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast \ -%endif -%if %enable_nouveau_gallium - --enable-gallium-nouveau \ -%endif -%if %enable_radeon_gallium - --enable-gallium-radeon \ - --enable-gallium-r600 \ + --with-gallium-drivers=r300,r600 \ %endif %endif %ifarch ppc ppc64 %sparc hppa + --with-dri-drivers=i810,i915,i965,mach64,r128,r200,radeon,tdfx,unichrome,swrast \ %if 0%{?suse_version} >= 1130 - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,swrast,nouveau \ + --with-gallium-drivers=r300,r600,nouveau \ %else - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,swrast \ -%endif -%if %enable_nouveau_gallium - --enable-gallium-nouveau \ -%endif + --with-gallium-drivers=r300,r600 \ %endif -%ifarch s390 s390x - --with-dri-drivers=swrast \ %endif -%ifarch %arm +%ifarch s390 s390x %arm --with-dri-drivers=swrast \ + --with-gallium-drivers="" \ %endif --disable-glut \ CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -198,7 +164,7 @@ --disable-glu \ --disable-glw \ --disable-glut \ - --disable-gallium \ + --with-gallium-drivers="" \ CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf make %{?jobs:-j%jobs} @@ -218,9 +184,7 @@ # global drirc file mkdir -p $RPM_BUILD_ROOT/etc install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc -%if 0%{?suse_version} > 1020 %fdupes -s $RPM_BUILD_ROOT/%_mandir -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -235,11 +199,7 @@ %config /etc/drirc %{_libdir}/lib*.so.* %{_libdir}/dri/ -%{_libdir}/egl/ -%exclude %{_libdir}/dri/nouveau_dri.so -%if 0%{?suse_version} >= 1130 -%exclude %{_libdir}/dri/nouveau_vieux_dri.so -%endif +#%{_libdir}/egl/ %files devel %defattr(-,root,root) @@ -255,6 +215,7 @@ %{_libdir}/libEGL.so %{_libdir}/libGLESv1_CM.so %{_libdir}/libGLESv2.so +%{_libdir}/libglapi.so %{_libdir}/pkgconfig/dri.pc %{_libdir}/pkgconfig/egl.pc %{_libdir}/pkgconfig/gl.pc @@ -263,11 +224,4 @@ %{_libdir}/pkgconfig/glesv2.pc %{_mandir}/man3/* -%files nouveau3d -%defattr(-,root,root) -%{_libdir}/dri/nouveau_dri.so -%if 0%{?suse_version} >= 1130 -%{_libdir}/dri/nouveau_vieux_dri.so -%endif - %changelog ++++++ U_Mesa-7.11-llvm3.patch ++++++ Makes Mesa work with LLVM3 (also pre-releases). Included in Mesa in post-11.7 Index: src/gallium/auxiliary/gallivm/lp_bld_debug.cpp =================================================================== --- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp.orig +++ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -193,7 +193,11 @@ lp_disassemble(const void* func) InitializeAllDisassemblers(); +#if HAVE_LLVM >= 0x0300 + OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple)); +#else OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple)); +#endif if (!AsmInfo) { debug_printf("error: no assembly info for target %s\n", Triple.c_str()); @@ -289,7 +293,11 @@ lp_disassemble(const void* func) pc += Size; +#if HAVE_LLVM >= 0x0300 + const MCInstrDesc &TID = TII->get(Inst.getOpcode()); +#else const TargetInstrDesc &TID = TII->get(Inst.getOpcode()); +#endif /* * Keep track of forward jumps to a nearby address. Index: src/gallium/auxiliary/gallivm/lp_bld_type.c =================================================================== --- src/gallium/auxiliary/gallivm/lp_bld_type.c.orig +++ src/gallium/auxiliary/gallivm/lp_bld_type.c @@ -325,8 +325,10 @@ lp_typekind_name(LLVMTypeKind t) return "LLVMArrayTypeKind"; case LLVMPointerTypeKind: return "LLVMPointerTypeKind"; +#if HAVE_LLVM < 0x0300 case LLVMOpaqueTypeKind: return "LLVMOpaqueTypeKind"; +#endif case LLVMVectorTypeKind: return "LLVMVectorTypeKind"; case LLVMMetadataTypeKind: Index: src/gallium/auxiliary/draw/draw_llvm.c =================================================================== --- src/gallium/auxiliary/draw/draw_llvm.c.orig +++ src/gallium/auxiliary/draw/draw_llvm.c @@ -96,7 +96,7 @@ draw_llvm_generate_elts(struct draw_llvm * Create LLVM type for struct draw_jit_texture */ static LLVMTypeRef -create_jit_texture_type(struct gallivm_state *gallivm) +create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name) { LLVMTargetDataRef target = gallivm->target; LLVMTypeRef texture_type; @@ -120,13 +120,21 @@ create_jit_texture_type(struct gallivm_s elem_types[DRAW_JIT_TEXTURE_BORDER_COLOR] = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); +#if HAVE_LLVM >= 0x0300 + texture_type = LLVMStructCreateNamed(gallivm->context, struct_name); + LLVMStructSetBody(texture_type, elem_types, + Elements(elem_types), 0); +#else texture_type = LLVMStructTypeInContext(gallivm->context, elem_types, Elements(elem_types), 0); + LLVMAddTypeName(gallivm->module, struct_name, texture_type); + /* Make sure the target's struct layout cache doesn't return * stale/invalid data. */ LLVMInvalidateStructLayout(gallivm->target, texture_type); +#endif LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, width, target, texture_type, @@ -176,7 +184,7 @@ create_jit_texture_type(struct gallivm_s */ static LLVMTypeRef create_jit_context_type(struct gallivm_state *gallivm, - LLVMTypeRef texture_type) + LLVMTypeRef texture_type, const char *struct_name) { LLVMTargetDataRef target = gallivm->target; LLVMTypeRef float_type = LLVMFloatTypeInContext(gallivm->context); @@ -189,11 +197,17 @@ create_jit_context_type(struct gallivm_s elem_types[3] = LLVMPointerType(float_type, 0); /* viewport */ elem_types[4] = LLVMArrayType(texture_type, PIPE_MAX_VERTEX_SAMPLERS); /* textures */ - +#if HAVE_LLVM >= 0x0300 + context_type = LLVMStructCreateNamed(gallivm->context, struct_name); + LLVMStructSetBody(context_type, elem_types, + Elements(elem_types), 0); +#else context_type = LLVMStructTypeInContext(gallivm->context, elem_types, Elements(elem_types), 0); + LLVMAddTypeName(gallivm->module, struct_name, context_type); LLVMInvalidateStructLayout(gallivm->target, context_type); +#endif LP_CHECK_MEMBER_OFFSET(struct draw_jit_context, vs_constants, target, context_type, 0); @@ -215,7 +229,7 @@ create_jit_context_type(struct gallivm_s * Create LLVM type for struct pipe_vertex_buffer */ static LLVMTypeRef -create_jit_vertex_buffer_type(struct gallivm_state *gallivm) +create_jit_vertex_buffer_type(struct gallivm_state *gallivm, const char *struct_name) { LLVMTargetDataRef target = gallivm->target; LLVMTypeRef elem_types[3]; @@ -225,10 +239,17 @@ create_jit_vertex_buffer_type(struct gal elem_types[1] = LLVMInt32TypeInContext(gallivm->context); elem_types[2] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0); /* vs_constants */ +#if HAVE_LLVM >= 0x0300 + vb_type = LLVMStructCreateNamed(gallivm->context, struct_name); + LLVMStructSetBody(vb_type, elem_types, + Elements(elem_types), 0); +#else vb_type = LLVMStructTypeInContext(gallivm->context, elem_types, Elements(elem_types), 0); + LLVMAddTypeName(gallivm->module, struct_name, vb_type); LLVMInvalidateStructLayout(gallivm->target, vb_type); +#endif LP_CHECK_MEMBER_OFFSET(struct pipe_vertex_buffer, stride, target, vb_type, 0); @@ -258,10 +279,17 @@ create_jit_vertex_header(struct gallivm_ elem_types[1] = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); elem_types[2] = LLVMArrayType(elem_types[1], data_elems); +#if HAVE_LLVM >= 0x0300 + vertex_header = LLVMStructCreateNamed(gallivm->context, struct_name); + LLVMStructSetBody(vertex_header, elem_types, + Elements(elem_types), 0); +#else vertex_header = LLVMStructTypeInContext(gallivm->context, elem_types, Elements(elem_types), 0); + LLVMAddTypeName(gallivm->module, struct_name, vertex_header); LLVMInvalidateStructLayout(gallivm->target, vertex_header); +#endif /* these are bit-fields and we can't take address of them LP_CHECK_MEMBER_OFFSET(struct vertex_header, clipmask, @@ -284,8 +312,6 @@ create_jit_vertex_header(struct gallivm_ target, vertex_header, DRAW_JIT_VERTEX_DATA); - LLVMAddTypeName(gallivm->module, struct_name, vertex_header); - return vertex_header; } @@ -299,19 +325,15 @@ create_jit_types(struct draw_llvm *llvm) struct gallivm_state *gallivm = llvm->gallivm; LLVMTypeRef texture_type, context_type, buffer_type, vb_type; - texture_type = create_jit_texture_type(gallivm); - LLVMAddTypeName(gallivm->module, "texture", texture_type); + texture_type = create_jit_texture_type(gallivm, "texture"); - context_type = create_jit_context_type(gallivm, texture_type); - LLVMAddTypeName(gallivm->module, "draw_jit_context", context_type); + context_type = create_jit_context_type(gallivm, texture_type, "draw_jit_context"); llvm->context_ptr_type = LLVMPointerType(context_type, 0); buffer_type = LLVMPointerType(LLVMIntTypeInContext(gallivm->context, 8), 0); - LLVMAddTypeName(gallivm->module, "buffer", buffer_type); llvm->buffer_ptr_type = LLVMPointerType(buffer_type, 0); - vb_type = create_jit_vertex_buffer_type(gallivm); - LLVMAddTypeName(gallivm->module, "pipe_vertex_buffer", vb_type); + vb_type = create_jit_vertex_buffer_type(gallivm, "pipe_vertex_buffer"); llvm->vb_ptr_type = LLVMPointerType(vb_type, 0); } Index: src/gallium/drivers/llvmpipe/lp_jit.c =================================================================== --- src/gallium/drivers/llvmpipe/lp_jit.c.orig +++ src/gallium/drivers/llvmpipe/lp_jit.c @@ -68,10 +68,17 @@ lp_jit_create_types(struct llvmpipe_cont elem_types[LP_JIT_TEXTURE_BORDER_COLOR] = LLVMArrayType(LLVMFloatTypeInContext(lc), 4); +#if HAVE_LLVM >= 0x0300 + texture_type = LLVMStructCreateNamed(gallivm->context, "texture"); + LLVMStructSetBody(texture_type, elem_types, + Elements(elem_types), 0); +#else texture_type = LLVMStructTypeInContext(lc, elem_types, Elements(elem_types), 0); + LLVMAddTypeName(gallivm->module, "texture", texture_type); LLVMInvalidateStructLayout(gallivm->target, texture_type); +#endif LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, width, gallivm->target, texture_type, @@ -112,8 +119,6 @@ lp_jit_create_types(struct llvmpipe_cont LP_CHECK_STRUCT_SIZE(struct lp_jit_texture, gallivm->target, texture_type); - - LLVMAddTypeName(gallivm->module, "texture", texture_type); } /* struct lp_jit_context */ @@ -129,11 +134,19 @@ lp_jit_create_types(struct llvmpipe_cont elem_types[LP_JIT_CTX_TEXTURES] = LLVMArrayType(texture_type, PIPE_MAX_SAMPLERS); +#if HAVE_LLVM >= 0x0300 + context_type = LLVMStructCreateNamed(gallivm->context, "context"); + LLVMStructSetBody(context_type, elem_types, + Elements(elem_types), 0); +#else context_type = LLVMStructTypeInContext(lc, elem_types, Elements(elem_types), 0); LLVMInvalidateStructLayout(gallivm->target, context_type); + LLVMAddTypeName(gallivm->module, "context", context_type); +#endif + LP_CHECK_MEMBER_OFFSET(struct lp_jit_context, constants, gallivm->target, context_type, LP_JIT_CTX_CONSTANTS); @@ -155,8 +168,6 @@ lp_jit_create_types(struct llvmpipe_cont LP_CHECK_STRUCT_SIZE(struct lp_jit_context, gallivm->target, context_type); - LLVMAddTypeName(gallivm->module, "context", context_type); - lp->jit_context_ptr_type = LLVMPointerType(context_type, 0); } ++++++ U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff ++++++ >From fbc2fcf685d22ec9bc9465e1f731529979497eaa Mon Sep 17 00:00:00 2001 From: Christopher James Halse Rogers <christopher.halse.rogers(a)canonical.com> Date: Thu, 04 Aug 2011 02:06:13 +0000 Subject: glx/dri2: Paper over errors in DRI2Connect when indirect DRI2 will throw BadRequest for this when the client is not local, but DRI2 is an implementation detail and not something callers should have to know about. Silently swallow errors in this case, and just propagate the failure through DRI2Connect's return code. Note: This is a candidate for the stable release branches. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28125 Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers(a)canonical.com> --- diff --git a/src/glx/dri2.c b/src/glx/dri2.c index 229840d..b1b5013 100644 --- a/src/glx/dri2.c +++ b/src/glx/dri2.c @@ -190,6 +190,15 @@ DRI2Error(Display *display, xError *err, XExtCodes *codes, int *ret_code) err->minorCode == X_DRI2DestroyDrawable) return True; + /* If the server is non-local DRI2Connect will raise BadRequest. + * Swallow this so that DRI2Connect can signal this in its return code */ + if (err->majorCode == codes->major_opcode && + err->minorCode == X_DRI2Connect && + err->errorCode == BadRequest) { + *ret_code = False; + return True; + } + return False; } -- cgit v0.8.3-6-g21f6 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.TbKdLq/_old 2011-09-01 12:10:06.000000000 +0200 +++ /var/tmp/diff_new_pack.TbKdLq/_new 2011-09-01 12:10:06.000000000 +0200 @@ -5,4 +5,3 @@ Mesa-devel obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>" provides "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>" -Mesa-nouveau3d ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 net-snmp for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '11

01 Sep '11

Hello community, here is the log from the commit of package net-snmp for openSUSE:Factory checked in at Thu Sep 1 12:08:07 CEST 2011. -------- --- net-snmp/net-snmp.changes 2011-05-19 14:43:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/net-snmp/net-snmp.changes 2011-07-14 19:47:53.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Jul 14 17:46:57 UTC 2011 - lchiquitto(a)novell.com + +- update upstream patches from branch V5-7-patches to 20110714 + +------------------------------------------------------------------- +Tue Jul 5 12:28:00 UTC 2011 - lchiquitto(a)novell.com + +- update to version 5.7: + new features and lots of bug fixes +- remove patches that are no longer needed: + net-snmp-5.6.0-enable-hrh-filesys.patch + net-snmp-5.6.1-recognize-jfs-and-xfs.patch + net-snmp-5.6.1-rpm490.patch +- refresh and rename patches to apply cleanly after update: + net-snmp-5.7.0-pie.patch + net-snmp-5.7.0-velocity-mib.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- net-snmp-5.5.0-velocity-mib.patch net-snmp-5.6.0-enable-hrh-filesys.patch net-snmp-5.6.0-pie.patch net-snmp-5.6.1-recognize-jfs-and-xfs.patch net-snmp-5.6.1-rpm490.patch net-snmp-5.6.1-upstream-20110512.patch.bz2 net-snmp-5.6.1.tar.bz2 New: ---- net-snmp-5.7-upstream-20110714.patch.bz2 net-snmp-5.7.0-pie.patch net-snmp-5.7.0-velocity-mib.patch net-snmp-5.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-snmp.spec ++++++ --- /var/tmp/diff_new_pack.uSgJaV/_old 2011-09-01 12:06:09.000000000 +0200 +++ /var/tmp/diff_new_pack.uSgJaV/_new 2011-09-01 12:06:09.000000000 +0200 @@ -27,8 +27,8 @@ %define netsnmp_agentx_socket_dir_rfc /var/agentx Name: net-snmp -Version: 5.6.1 -Release: 10 +Version: 5.7 +Release: 1 License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,17 +55,15 @@ Source7: net-snmp.sysconfig Source8: net-snmp-rpmlintrc Source9: baselibs.conf -Patch0: net-snmp-5.6.1-upstream-20110512.patch.bz2 +%define patchdate 20110714 +Patch0: net-snmp-%{version}-upstream-%{patchdate}.patch.bz2 # unused patch atm Patch1: net-snmp-5.5.0-socket-path.patch Patch2: net-snmp-5.5.0-testing-empty-arptable.patch -Patch3: net-snmp-5.6.0-pie.patch +Patch3: net-snmp-5.7.0-pie.patch Patch5: net-snmp-5.6.1-net-snmp-config-headercheck.patch Patch6: net-snmp-5.5.0-perl-tk-warning.patch -Patch7: net-snmp-5.5.0-velocity-mib.patch -Patch9: net-snmp-5.6.0-enable-hrh-filesys.patch -Patch10: net-snmp-5.6.1-recognize-jfs-and-xfs.patch -Patch11: net-snmp-5.6.1-rpm490.patch +Patch7: net-snmp-5.7.0-velocity-mib.patch # Summary: SNMP Daemon @@ -90,9 +88,9 @@ -------- Wes Hardaker <hardaker(a)users.sourceforge.net> -%define library_name libsnmp25 +%define library_name libsnmp30 -%package -n libsnmp25 +%package -n libsnmp30 License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Other Requires: snmp-mibs = %{version} @@ -100,7 +98,7 @@ # Summary: Shared Libraries from net-snmp -%description -n libsnmp25 +%description -n libsnmp30 Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: @@ -207,9 +205,6 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 %build MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \ ++++++ net-snmp-5.6.1-upstream-20110512.patch.bz2 -> net-snmp-5.7-upstream-20110714.patch.bz2 ++++++ Files net-snmp/net-snmp-5.6.1-upstream-20110512.patch.bz2 and /mounts/work_src_done/STABLE/net-snmp/net-snmp-5.7-upstream-20110714.patch.bz2 differ ++++++ net-snmp-5.6.0-pie.patch -> net-snmp-5.7.0-pie.patch ++++++ --- net-snmp/net-snmp-5.6.0-pie.patch 2010-10-20 03:09:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/net-snmp/net-snmp-5.7.0-pie.patch 2011-07-05 20:55:43.000000000 +0200 @@ -1,8 +1,8 @@ -Index: net-snmp-5.6/agent/Makefile.in +Index: net-snmp-5.7/agent/Makefile.in =================================================================== ---- net-snmp-5.6.orig/agent/Makefile.in -+++ net-snmp-5.6/agent/Makefile.in -@@ -245,7 +245,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c +--- net-snmp-5.7.orig/agent/Makefile.in ++++ net-snmp-5.7/agent/Makefile.in +@@ -294,7 +294,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(MIBLIB) $(LIBTARG) @@ -11,11 +11,11 @@ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) -Index: net-snmp-5.6/apps/Makefile.in +Index: net-snmp-5.7/apps/Makefile.in =================================================================== ---- net-snmp-5.6.orig/apps/Makefile.in -+++ net-snmp-5.6/apps/Makefile.in -@@ -127,7 +127,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX +--- net-snmp-5.7.orig/apps/Makefile.in ++++ net-snmp-5.7/apps/Makefile.in +@@ -173,7 +173,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) ++++++ net-snmp-5.5.0-velocity-mib.patch -> net-snmp-5.7.0-velocity-mib.patch ++++++ --- net-snmp/net-snmp-5.5.0-velocity-mib.patch 2010-04-30 18:03:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/net-snmp/net-snmp-5.7.0-velocity-mib.patch 2011-07-05 20:55:45.000000000 +0200 @@ -56,7 +56,7 @@ + + config_require(host/hr_system) + config_require(velocity/velocity_system) -+ config_require(host/hr_storage) ++ config_require(host/hrh_storage) + config_require(host/hr_device) + config_require(host/hr_other) + config_require(host/hr_proc) @@ -64,7 +64,7 @@ + config_require(host/hr_print) + config_require(host/hr_disk) + config_require(host/hr_partition) -+ config_require(host/hr_filesys) ++ config_require(host/hrh_filesys) + config_require(velocity/velocity_swrun) + config_require(host/hr_swrun) + config_require(host/hr_swinst) ++++++ net-snmp-5.6.1.tar.bz2 -> net-snmp-5.7.tar.bz2 ++++++ ++++ 139982 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 samba for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '11

01 Sep '11

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Thu Sep 1 12:05:56 CEST 2011. -------- --- samba/samba.changes 2011-08-27 22:40:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2011-08-31 00:10:50.000000000 +0200 @@ -2 +2 @@ -Sat Aug 27 19:38:01 UTC 2011 - lmuelle(a)suse.de +Tue Aug 30 21:38:12 UTC 2011 - lmuelle(a)suse.de @@ -4 +4,2 @@ -- Optimize serverid_exists() for Solaris; (bso#8395). +- Microsoft Word from Microsoft Office 2007 fails to save as on a share with + SMB2; (bso#8412). @@ -7 +8 @@ -Sat Aug 27 19:29:37 UTC 2011 - lmuelle(a)suse.de +Tue Aug 30 21:29:07 UTC 2011 - lmuelle(a)suse.de @@ -9 +10,2 @@ -- talloc: check block count after references test. +- Use sys_write and sys_read in fork_domain_child to fix a winbind race + leading to 100% CPU usage; (bso#8409). @@ -12 +14 @@ -Sat Aug 27 19:26:06 UTC 2011 - lmuelle(a)suse.de +Tue Aug 30 18:41:20 UTC 2011 - lmuelle(a)suse.de @@ -14 +16 @@ -- talloc: added test suite for talloc_free_children(). +- Fix wrong reply to smb2 durable handle reconnect (DHnC) request; (bso#8428). @@ -17 +19 @@ -Sat Aug 27 19:21:58 UTC 2011 - lmuelle(a)suse.de +Tue Aug 30 18:31:29 UTC 2011 - lmuelle(a)suse.de @@ -19 +21 @@ -- talloc: license info erratum in the manpage. +- Fix infinite loop in ACL module code; (bso#8422). @@ -22 +24 @@ -Sat Aug 27 19:08:11 UTC 2011 - lmuelle(a)suse.de +Mon Aug 29 19:28:54 UTC 2011 - lmuelle(a)suse.de @@ -24 +26 @@ -- talloc: fix typos and better differentiation between versions 1 and 2. +- Fix getent group if trusted domains are not reachable; (bso#8420). @@ -27 +29 @@ -Sat Aug 27 19:05:09 UTC 2011 - lmuelle(a)suse.de +Mon Aug 29 16:51:58 UTC 2011 - lmuelle(a)suse.de @@ -29 +31 @@ -- talloc: preserve context name on talloc_free_children(). +- smbclient can't access a NT4 share since 3.6.0; (bso#8385). @@ -32 +34,6 @@ -Sat Aug 27 19:01:41 UTC 2011 - lmuelle(a)suse.de +Sat Aug 27 19:38:01 UTC 2011 - lmuelle(a)suse.de + +- Optimize serverid_exists() for Solaris; (bso#8395). + +------------------------------------------------------------------- +Sat Aug 27 19:29:37 UTC 2011 - lmuelle(a)suse.de @@ -34 +41,7 @@ -- talloc: ensure the sibling linked list remains valid during a free. +- talloc: + + check block count after references test. + + added test suite for talloc_free_children(). + + license info erratum in the manpage. + + fix typos and better differentiation between versions 1 and 2. + + preserve context name on talloc_free_children(). + + ensure the sibling linked list remains valid during a free. calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.PZFNY5/_old 2011-09-01 12:05:20.000000000 +0200 +++ /var/tmp/diff_new_pack.PZFNY5/_new 2011-09-01 12:05:20.000000000 +0200 @@ -82,7 +82,7 @@ %endif Url: http://www.samba.org/ Version: 3.6.0 -Release: 2 +Release: 3 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -414,7 +414,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.PZFNY5/_old 2011-09-01 12:05:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PZFNY5/_new 2011-09-01 12:05:21.000000000 +0200 @@ -86,7 +86,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.6.0 -Release: 2 +Release: 3 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -184,7 +184,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package client @@ -224,7 +224,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -251,7 +251,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %endif @@ -281,7 +281,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %endif @@ -308,7 +308,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %if %{make_utils} @@ -331,7 +331,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %endif @@ -362,7 +362,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -389,13 +389,13 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %endif @@ -441,7 +441,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libnetapi0 @@ -460,7 +460,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libnetapi-devel @@ -485,7 +485,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -507,13 +507,13 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %endif @@ -550,7 +550,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libwbclient0 @@ -569,7 +569,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libwbclient-devel @@ -594,7 +594,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libtalloc2 @@ -603,7 +603,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtalloc_ver} -Release: 2 +Release: 3 PreReq: /sbin/ldconfig %description -n libtalloc2 @@ -615,7 +615,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libtalloc-devel @@ -624,7 +624,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtalloc_ver} -Release: 2 +Release: 3 %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else @@ -642,7 +642,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libtdb1 @@ -651,7 +651,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtdb_ver} -Release: 2 +Release: 3 PreReq: /sbin/ldconfig %description -n libtdb1 @@ -663,7 +663,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libtdb-devel @@ -672,7 +672,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtdb_ver} -Release: 2 +Release: 3 #BuildRequires: pkg-config Requires: libtdb1 = %{libtdb_ver} @@ -686,7 +686,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libtevent0 @@ -695,7 +695,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 2 +Release: 3 PreReq: /sbin/ldconfig %description -n libtevent0 @@ -707,7 +707,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libtevent-devel @@ -716,7 +716,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 2 +Release: 3 %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else @@ -735,7 +735,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libldb1 @@ -744,7 +744,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 2 +Release: 3 PreReq: /sbin/ldconfig BuildRequires: popt-devel @@ -758,7 +758,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %package -n libldb-devel @@ -767,7 +767,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 2 +Release: 3 %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else @@ -785,7 +785,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %if %{make_ldapsmb} @@ -796,7 +796,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 304 +Release: 305 Requires: perl-ldap %description -n ldapsmb @@ -809,7 +809,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2610 +Source Timestamp: 2622 Branch : trunk %endif ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.PZFNY5/_old 2011-09-01 12:05:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PZFNY5/_new 2011-09-01 12:05:21.000000000 +0200 @@ -1,2 +1,2 @@ -2610 +2622 Branch : trunk ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/11ab2d68023dbfd9089a7e2ec2d36ef4f1f7974e new/patches/samba.org/11ab2d68023dbfd9089a7e2ec2d36ef4f1f7974e --- old/patches/samba.org/11ab2d68023dbfd9089a7e2ec2d36ef4f1f7974e 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/11ab2d68023dbfd9089a7e2ec2d36ef4f1f7974e 2011-08-30 23:33:46.000000000 +0200 @@ -0,0 +1,25 @@ +commit 11ab2d68023dbfd9089a7e2ec2d36ef4f1f7974e +Author: Volker Lendecke <vl(a)samba.org> +Date: Fri Aug 26 11:39:41 2011 +0200 + + s3: Use sys_write in fork_domain_child + + Counterpart for last checkin. A lot less likely, but not impossible in a child. + + Autobuild-User: Volker Lendecke <vlendec(a)samba.org> + Autobuild-Date: Fri Aug 26 13:14:27 CEST 2011 on sn-devel-104 + (cherry picked from commit e0e3d215b1902ecbeb3d469af9a196856711921e) + +Index: source3/winbindd/winbindd_dual.c +=================================================================== +--- source3/winbindd/winbindd_dual.c.orig ++++ source3/winbindd/winbindd_dual.c +@@ -1361,7 +1361,7 @@ static bool fork_domain_child(struct win + + status = winbindd_reinit_after_fork(child, child->logfilename); + +- nwritten = write(state.sock, &status, sizeof(status)); ++ nwritten = sys_write(state.sock, &status, sizeof(status)); + if (nwritten != sizeof(status)) { + DEBUG(1, ("fork_domain_child: Could not write status: " + "nwritten=%d, error=%s\n", (int)nwritten, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/1a996fe1d12a55e68b7266ce5db8972b6e5f101a new/patches/samba.org/1a996fe1d12a55e68b7266ce5db8972b6e5f101a --- old/patches/samba.org/1a996fe1d12a55e68b7266ce5db8972b6e5f101a 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/1a996fe1d12a55e68b7266ce5db8972b6e5f101a 2011-08-30 23:55:18.000000000 +0200 @@ -0,0 +1,28 @@ +commit 1a996fe1d12a55e68b7266ce5db8972b6e5f101a +Author: Volker Lendecke <vl(a)samba.org> +Date: Thu Aug 25 20:13:09 2011 +0200 + + s3: Fix getent group if trusted domains are not reachable + + Fix bug #8420 (wb_group_members: non-resistance against garbage). + +Index: source3/winbindd/wb_group_members.c +=================================================================== +--- source3/winbindd/wb_group_members.c.orig ++++ source3/winbindd/wb_group_members.c +@@ -209,8 +209,13 @@ static void wb_groups_members_done(struc + * and just continue if an error occured. + */ + +- if (tevent_req_nterror(req, status)) { +- return; ++ if (!NT_STATUS_IS_OK(status)) { ++ if (!NT_STATUS_EQUAL( ++ status, NT_STATUS_TRUSTED_DOMAIN_FAILURE)) { ++ tevent_req_nterror(req, status); ++ return; ++ } ++ num_members = 0; + } + + num_all_members = talloc_array_length(state->all_members); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/225c66ada497449a55d2eed6dfb27cedf3a863c0 new/patches/samba.org/225c66ada497449a55d2eed6dfb27cedf3a863c0 --- old/patches/samba.org/225c66ada497449a55d2eed6dfb27cedf3a863c0 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/225c66ada497449a55d2eed6dfb27cedf3a863c0 2011-08-30 23:02:29.000000000 +0200 @@ -0,0 +1,23 @@ +commit 225c66ada497449a55d2eed6dfb27cedf3a863c0 +Author: Jeremy Allison <jra(a)samba.org> +Date: Mon Aug 29 16:46:15 2011 -0700 + + Fix bug Bug 8422 - Infinite loop in ACL module code. + + Missing assignment means this loop will never terminate. Need to be applied + to 3.5.x and 3.6.1. + (cherry picked from commit 218cccfdf1820a9840a5cbc7df3915b6b58a762d) + +Index: source3/modules/vfs_acl_common.c +=================================================================== +--- source3/modules/vfs_acl_common.c.orig ++++ source3/modules/vfs_acl_common.c +@@ -868,7 +868,7 @@ static int acl_common_remove_object(vfs_ + /* Ensure we have this file open with DELETE access. */ + id = vfs_file_id_from_sbuf(conn, &local_fname.st); + for (fsp = file_find_di_first(conn->sconn, id); fsp; +- file_find_di_next(fsp)) { ++ fsp = file_find_di_next(fsp)) { + if (fsp->access_mask & DELETE_ACCESS && + fsp->delete_on_close) { + /* We did open this for delete, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/2f0a5b477f58378c3505631d15b422057b037efe new/patches/samba.org/2f0a5b477f58378c3505631d15b422057b037efe --- old/patches/samba.org/2f0a5b477f58378c3505631d15b422057b037efe 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/2f0a5b477f58378c3505631d15b422057b037efe 2011-08-30 23:34:03.000000000 +0200 @@ -0,0 +1,29 @@ +commit 2f0a5b477f58378c3505631d15b422057b037efe +Author: Volker Lendecke <vl(a)samba.org> +Date: Fri Aug 26 11:38:21 2011 +0200 + + s3: Use sys_read in fork_domain_child + + I've seen + + [2011/08/26 01:44:10.872057, 1] winbindd/winbindd_dual.c:1336(fork_domain_child) + fork_domain_child: Could not read child status: nread=-1, error=Interrupted system call + + on a customer box. Not good. + (cherry picked from commit 964e809ce2069ad888e0fb12dfe51bac5a461508) + + The last 3 patches address bug #8409 (f7d97868 created a new race condition). + +Index: source3/winbindd/winbindd_dual.c +=================================================================== +--- source3/winbindd/winbindd_dual.c.orig ++++ source3/winbindd/winbindd_dual.c +@@ -1330,7 +1330,7 @@ static bool fork_domain_child(struct win + + close(fdpair[0]); + +- nread = read(fdpair[1], &status, sizeof(status)); ++ nread = sys_read(fdpair[1], &status, sizeof(status)); + if (nread != sizeof(status)) { + DEBUG(1, ("fork_domain_child: Could not read child status: " + "nread=%d, error=%s\n", (int)nread, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/45392d05ff059987fb76d3818969177b5a5de6b0 new/patches/samba.org/45392d05ff059987fb76d3818969177b5a5de6b0 --- old/patches/samba.org/45392d05ff059987fb76d3818969177b5a5de6b0 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/45392d05ff059987fb76d3818969177b5a5de6b0 2011-08-30 23:12:07.000000000 +0200 @@ -0,0 +1,72 @@ +commit 45392d05ff059987fb76d3818969177b5a5de6b0 +Author: Volker Lendecke <vl(a)samba.org> +Date: Mon Aug 22 14:16:26 2011 +0200 + + s3: Fix bug 8385 + + Poll and select behave differently regarding error handling. When doing the + connect(2), we can not rely on poll telling us both readability and writability + upon error. Just always try a second connect(2). At least on Linux it returns 0 + when it succeeded. + + Signed-off-by: Jeremy Allison <jra(a)samba.org> + + Autobuild-User: Jeremy Allison <jra(a)samba.org> + Autobuild-Date: Thu Aug 25 19:39:12 CEST 2011 on sn-devel-104 + (cherry picked from commit 50e30afa608dfdeae8a260730ead9761ed424dad) + +Index: lib/async_req/async_sock.c +=================================================================== +--- lib/async_req/async_sock.c.orig ++++ lib/async_req/async_sock.c +@@ -325,36 +325,24 @@ static void async_connect_connected(stru + priv, struct tevent_req); + struct async_connect_state *state = + tevent_req_data(req, struct async_connect_state); ++ int ret; + +- /* +- * Stevens, Network Programming says that if there's a +- * successful connect, the socket is only writable. Upon an +- * error, it's both readable and writable. +- */ +- if ((flags & (TEVENT_FD_READ|TEVENT_FD_WRITE)) +- == (TEVENT_FD_READ|TEVENT_FD_WRITE)) { +- int ret; +- +- ret = connect(state->fd, +- (struct sockaddr *)(void *)&state->address, +- state->address_len); +- if (ret == 0) { +- TALLOC_FREE(fde); +- tevent_req_done(req); +- return; +- } +- +- if (errno == EINPROGRESS) { +- /* Try again later, leave the fde around */ +- return; +- } ++ ret = connect(state->fd, (struct sockaddr *)(void *)&state->address, ++ state->address_len); ++ if (ret == 0) { ++ state->sys_errno = 0; + TALLOC_FREE(fde); +- tevent_req_error(req, errno); ++ tevent_req_done(req); + return; + } +- +- state->sys_errno = 0; +- tevent_req_done(req); ++ if (errno == EINPROGRESS) { ++ /* Try again later, leave the fde around */ ++ return; ++ } ++ state->sys_errno = errno; ++ TALLOC_FREE(fde); ++ tevent_req_error(req, errno); ++ return; + } + + int async_connect_recv(struct tevent_req *req, int *perrno) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/a0a799663bd4780bb9f948e2dd0635dadb4e2c40 new/patches/samba.org/a0a799663bd4780bb9f948e2dd0635dadb4e2c40 --- old/patches/samba.org/a0a799663bd4780bb9f948e2dd0635dadb4e2c40 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/a0a799663bd4780bb9f948e2dd0635dadb4e2c40 2011-08-30 23:44:07.000000000 +0200 @@ -0,0 +1,87 @@ +commit a0a799663bd4780bb9f948e2dd0635dadb4e2c40 +Author: Jeremy Allison <jra(a)samba.org> +Date: Mon Aug 29 16:47:16 2011 -0700 + + Fix bug 8412 - Microsoft Office 2007 (Microsoft Word) fails to save as on a Samba share with SMB2. (cherry picked from commit dec3b21cd1737b317749e7ebced5aa1c2115ebdf) + +Index: source3/smbd/reply.c +=================================================================== +--- source3/smbd/reply.c.orig ++++ source3/smbd/reply.c +@@ -5936,6 +5936,47 @@ static void notify_rename(connection_str + } + + /**************************************************************************** ++ Returns an error if the parent directory for a filename is open in an ++ incompatible way. ++****************************************************************************/ ++ ++static NTSTATUS parent_dirname_compatible_open(connection_struct *conn, ++ const struct smb_filename *smb_fname_dst_in) ++{ ++ char *parent_dir = NULL; ++ struct smb_filename smb_fname_parent; ++ struct file_id id; ++ files_struct *fsp = NULL; ++ int ret; ++ ++ if (!parent_dirname(talloc_tos(), smb_fname_dst_in->base_name, ++ &parent_dir, NULL)) { ++ return NT_STATUS_NO_MEMORY; ++ } ++ ZERO_STRUCT(smb_fname_parent); ++ smb_fname_parent.base_name = parent_dir; ++ ++ ret = SMB_VFS_LSTAT(conn, &smb_fname_parent); ++ if (ret == -1) { ++ return map_nt_error_from_unix(errno); ++ } ++ ++ /* ++ * We're only checking on this smbd here, mostly good ++ * enough.. and will pass tests. ++ */ ++ ++ id = vfs_file_id_from_sbuf(conn, &smb_fname_parent.st); ++ for (fsp = file_find_di_first(conn->sconn, id); fsp; ++ fsp = file_find_di_next(fsp)) { ++ if (fsp->access_mask & DELETE_ACCESS) { ++ return NT_STATUS_SHARING_VIOLATION; ++ } ++ } ++ return NT_STATUS_OK; ++} ++ ++/**************************************************************************** + Rename an open file - given an fsp. + ****************************************************************************/ + +@@ -5955,6 +5996,11 @@ NTSTATUS rename_internals_fsp(connection + if (!NT_STATUS_IS_OK(status)) { + return status; + } ++ ++ status = parent_dirname_compatible_open(conn, smb_fname_dst_in); ++ if (!NT_STATUS_IS_OK(status)) { ++ return status; ++ } + + /* Make a copy of the dst smb_fname structs */ + +Index: source3/smbd/smb2_setinfo.c +=================================================================== +--- source3/smbd/smb2_setinfo.c.orig ++++ source3/smbd/smb2_setinfo.c +@@ -219,12 +219,6 @@ static struct tevent_req *smbd_smb2_seti + if (file_info_level == SMB_FILE_RENAME_INFORMATION) { + /* SMB2_FILE_RENAME_INFORMATION_INTERNAL == 0xFF00 + in_file_info_class */ + file_info_level = SMB2_FILE_RENAME_INFORMATION_INTERNAL; +- if (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK && +- fsp->oplock_type != NO_OPLOCK) { +- /* No break, but error. */ +- tevent_req_nterror(req, NT_STATUS_SHARING_VIOLATION); +- return tevent_req_post(req, ev); +- } + } + + if (fsp->fh->fd == -1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/b181fe9ec50ff63074b217143b6daa5cddfb8853 new/patches/samba.org/b181fe9ec50ff63074b217143b6daa5cddfb8853 --- old/patches/samba.org/b181fe9ec50ff63074b217143b6daa5cddfb8853 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/b181fe9ec50ff63074b217143b6daa5cddfb8853 2011-08-30 23:33:34.000000000 +0200 @@ -0,0 +1,58 @@ +commit b181fe9ec50ff63074b217143b6daa5cddfb8853 +Author: Volker Lendecke <vl(a)samba.org> +Date: Fri Aug 26 16:54:18 2011 +0200 + + s3: Fix a winbind race leading to 100% CPU + + This fixes a race condition that leads to the winbindd_children list becoming + corrupted. It happens when on a busy winbind SIGCHLD is a bit late. + + Imagine a winbind with multiple requests in the queue for a single child. Child + dies, and before the SIGCHLD handler is called we find the socket to be dead. + wb_child_request_done is called, receiving an error from wb_simple_trans_recv. + It closes the socket. Then immediately the wb_child_request_trigger will do + another fork_domain_child before the signal handler is called. This means that + we do another fork_domain_child, we have child->sock==-1 at this point. + fork_domain_child will do a DLIST_ADD(winbindd_children, child) a second time + where the child is already part of that list. This corrupts the list. Then the + signal handler kicks in, spinning in + + for (child = winbindd_children; child != NULL; child = child->next) { + + forever. Not good. This patch makes sure that both conditions (sock==-1 and not + part of the list) for a winbindd_child struct match up. + + Autobuild-User: Volker Lendecke <vlendec(a)samba.org> + Autobuild-Date: Fri Aug 26 18:51:24 CEST 2011 on sn-devel-104 + (cherry picked from commit ed058f4dc3e059967f3c0538bc220866e9c63588) + +Index: source3/winbindd/winbindd_dual.c +=================================================================== +--- source3/winbindd/winbindd_dual.c.orig ++++ source3/winbindd/winbindd_dual.c +@@ -43,6 +43,8 @@ + extern bool override_logfile; + extern struct winbindd_methods cache_methods; + ++static struct winbindd_child *winbindd_children = NULL; ++ + /* Read some data from a client connection */ + + static NTSTATUS child_read_request(struct winbindd_cli_state *state) +@@ -171,6 +173,7 @@ static void wb_child_request_done(struct + */ + close(state->child->sock); + state->child->sock = -1; ++ DLIST_REMOVE(winbindd_children, state->child); + tevent_req_error(req, err); + return; + } +@@ -489,8 +492,6 @@ void setup_child(struct winbindd_domain + SMB_ASSERT(child->binding_handle != NULL); + } + +-static struct winbindd_child *winbindd_children = NULL; +- + void winbind_child_died(pid_t pid) + { + struct winbindd_child *child; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/fc8c5880d9785103e3345781bfca48e67a92cc33 new/patches/samba.org/fc8c5880d9785103e3345781bfca48e67a92cc33 --- old/patches/samba.org/fc8c5880d9785103e3345781bfca48e67a92cc33 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/fc8c5880d9785103e3345781bfca48e67a92cc33 2011-08-31 00:04:24.000000000 +0200 @@ -0,0 +1,75 @@ +commit fc8c5880d9785103e3345781bfca48e67a92cc33 +Author: Christian Ambach <ambi(a)samba.org> +Date: Tue Aug 30 17:39:56 2011 +0200 + + s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle reconnect) + + According to [MS-SMB2] 3.3.5.9.7 + (http://msdn.microsoft.com/en-us/library/cc246784%28v=PROT.13%29.aspx), + smbd must reply with NT_STATUS_OBJECT_NAME_NOT_FOUND as it does not + support durable file-handles yet. + + I have seen w2k8r2 running xcopy /C ending up in an endless loop + trying to get back the original file handle from smbd sending the same + requests over and over. + + Metze, Jeremy, please check! + +Index: source3/smbd/smb2_create.c +=================================================================== +--- source3/smbd/smb2_create.c.orig ++++ source3/smbd/smb2_create.c +@@ -537,7 +537,7 @@ static struct tevent_req *smbd_smb2_crea + + if (exta) { + if (dhnc) { +- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); ++ tevent_req_nterror(req,NT_STATUS_OBJECT_NAME_NOT_FOUND); + return tevent_req_post(req, ev); + } + +@@ -552,7 +552,7 @@ static struct tevent_req *smbd_smb2_crea + + if (mxac) { + if (dhnc) { +- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); ++ tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND); + return tevent_req_post(req, ev); + } + +@@ -570,7 +570,7 @@ static struct tevent_req *smbd_smb2_crea + enum ndr_err_code ndr_err; + + if (dhnc) { +- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); ++ tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND); + return tevent_req_post(req, ev); + } + +@@ -592,7 +592,7 @@ static struct tevent_req *smbd_smb2_crea + + if (dhnq) { + if (dhnc) { +- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); ++ tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND); + return tevent_req_post(req, ev); + } + +@@ -618,7 +618,7 @@ static struct tevent_req *smbd_smb2_crea + + if (alsi) { + if (dhnc) { +- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); ++ tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND); + return tevent_req_post(req, ev); + } + +@@ -635,7 +635,7 @@ static struct tevent_req *smbd_smb2_crea + struct tm *tm; + + if (dhnc) { +- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); ++ tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND); + return tevent_req_post(req, ev); + } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2011-08-27 21:38:56.000000000 +0200 +++ new/patches/series 2011-08-31 00:04:20.000000000 +0200 @@ -25,6 +25,14 @@ samba.org/2e07c662b08f8bba5cc03efcdcc13165e392b6e8 -p0 # test suite for talloc_free_children() samba.org/8d46b29595c4da27b175b25a08b945fbeeeab3ec -p0 # check block count after references test samba.org/9bf2b3034b4c9523bfac779e518a2a1a6d76ef46 -p0 # bso 8395 +samba.org/225c66ada497449a55d2eed6dfb27cedf3a863c0 -p0 # bso 8422 +samba.org/45392d05ff059987fb76d3818969177b5a5de6b0 -p0 # bso 8385 +samba.org/b181fe9ec50ff63074b217143b6daa5cddfb8853 -p0 # bso 8409 +samba.org/11ab2d68023dbfd9089a7e2ec2d36ef4f1f7974e -p0 # bso 8409 +samba.org/2f0a5b477f58378c3505631d15b422057b037efe -p0 # bso 8409 +samba.org/a0a799663bd4780bb9f948e2dd0635dadb4e2c40 -p0 # bso 8412 +samba.org/1a996fe1d12a55e68b7266ce5db8972b6e5f101a -p0 # bso 8420 +samba.org/fc8c5880d9785103e3345781bfca48e67a92cc33 -p0 # bso 8428 # SuSE specific changes # disabled -> WIP lmuelle ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2011-08-27 21:40:37.000000000 +0200 +++ new/vendor-files/tools/package-data 2011-08-31 00:07:01.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2610" +SAMBA_PACKAGE_SVN_VERSION="2622" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ctdb for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '11

01 Sep '11

Hello community, here is the log from the commit of package ctdb for openSUSE:Factory checked in at Thu Sep 1 12:04:59 CEST 2011. -------- calling whatdependson for head-i586 Old: ---- ctdb-1.2.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ctdb.spec ++++++ --- /var/tmp/diff_new_pack.ur5Au7/_old 2011-09-01 12:04:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ur5Au7/_new 2011-09-01 12:04:30.000000000 +0200 @@ -20,7 +20,7 @@ Name: ctdb Version: 1.2.29 -Release: 1 +Release: 3 License: GNU GPL version 3 Group: System/Daemons Url: http://ctdb.samba.org/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-proto-devel for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '11

01 Sep '11

Hello community, here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory checked in at Thu Sep 1 12:00:51 CEST 2011. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2011-05-18 21:17:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2011-08-30 17:30:38.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Aug 30 14:53:08 UTC 2011 - sndirsch(a)suse.com + +- update util-macros to release 1.15.0 +- obsoletes xorg-patch5473.patch + +------------------------------------------------------------------- +Sat Aug 13 15:21:11 UTC 2011 - vljn(a)ovi.com + +- Update dri2proto 2.6 + * Needed by next Mesa release. + +------------------------------------------------------------------- +Fri Aug 12 11:25:11 UTC 2011 - vljn(a)ovi.com + +- Update glproto 1.4.14 + * Recquired for next Mesa release. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service _service:download_files:util-macros-1.13.0.tar.bz2 dri2proto-2.3.tar.bz2 glproto-1.4.12.tar.bz2 util-macros-1.11.0.tar.bz2 xorg-patch5473.patch New: ---- dri2proto-2.6.tar.bz2 glproto-1.4.14.tar.bz2 util-macros-1.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.ayR44K/_old 2011-09-01 12:00:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ayR44K/_new 2011-09-01 12:00:27.000000000 +0200 @@ -24,7 +24,7 @@ Provides: pkgconfig(applewmproto) pkgconfig(bigreqsprot) pkgconfig(compositeproto) pkgconfig(damageproto) pkgconfig(dmxproto) pkgconfig(dri2proto) pkgconfig(evieext) pkgconfig(fixesproto) pkgconfig(fontcacheproto) pkgconfig(fontsproto) pkgconfig(glproto) pkgconfig(inputproto) pkgconfig(kbproto) pkgconfig(libpthread-stubs) pkgconfig(printproto) pkgconfig(randrproto) pkgconfig(recordproto) pkgconfig(renderproto) pkgconfig(resourceproto) pkgconfig(scrnsaveproto) pkgconfig(trapproto) pkgconfig(util-macros) pkgconfig(videoproto) pkgconfig(vncproto) pkgconfig(windowswmproto) pkgconfig(xcb-proto) pkgconfig(xcliplistproto) pkgconfig(xcmiscproto) pkgconfig(x86bigfontproto) pkgconfig(xf86dgaproto) pkgconfig(xf86driproto) pkgconfig(xf86miscproto) pkgconfig(xf86rushproto) pkgconfig(xf86vidmodeproto) pkgconfig(xineramaproto) pkgconfig(xproto) pkgconfig(xproxymanagementprotocol) Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 20 +Release: 22 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -37,7 +37,7 @@ Source5: fixesproto-5.0.tar.bz2 Source6: fontcacheproto-0.1.3.tar.bz2 Source7: fontsproto-2.1.1.tar.bz2 -Source8: glproto-1.4.12.tar.bz2 +Source8: glproto-1.4.14.tar.bz2 Source9: inputproto-2.0.1.tar.bz2 Source10: kbproto-1.0.5.tar.bz2 Source11: printproto-1.0.4.tar.bz2 @@ -47,7 +47,7 @@ Source15: resourceproto-1.1.1.tar.bz2 Source16: scrnsaverproto-1.2.1.tar.bz2 Source17: trapproto-X11R7.0-3.4.3.tar.bz2 -Source18: ftp://ftp.fu-berlin.de/unix/X11/FTP.X.ORG/pub/individual/util/util-macros-1… +Source18: util-macros-1.15.0.tar.bz2 Source19: videoproto-2.3.1.tar.bz2 Source20: windowswmproto-1.0.4.tar.bz2 Source21: xcmiscproto-1.2.1.tar.bz2 @@ -66,8 +66,7 @@ Source34: libpthread-stubs-0.3.tar.bz2 Source35: vncproto-20070501.tar.bz2 Source36: xcliplistproto-20070501.tar.bz2 -Source37: dri2proto-2.3.tar.bz2 -Patch1: [http:]//patchwork.freedesktop.org/patch/5473/raw/xorg-patch5473.patch +Source37: dri2proto-2.6.tar.bz2 Requires: glibc-devel python-base = %{py_ver} %description @@ -93,8 +92,6 @@ %prep %setup -T -c %{name} for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done -cd util-macros-1.11.0 -%patch1 -p1 %build ++++++ dri2proto-2.3.tar.bz2 -> dri2proto-2.6.tar.bz2 ++++++ ++++ 23495 lines of diff (skipped) ++++++ glproto-1.4.12.tar.bz2 -> glproto-1.4.14.tar.bz2 ++++++ ++++ 21632 lines of diff (skipped) ++++++ util-macros-1.11.0.tar.bz2 -> util-macros-1.15.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.11.0/ChangeLog new/util-macros-1.15.0/ChangeLog --- old/util-macros-1.11.0/ChangeLog 2010-10-30 05:44:37.000000000 +0200 +++ new/util-macros-1.15.0/ChangeLog 2011-06-24 02:15:52.000000000 +0200 @@ -1,3 +1,267 @@ +commit 08dd5d30c137abe43d5b1673edc39eb569881d66 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Jun 23 08:03:13 2011 -0400 + + Version bump: 1.15.0 + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit b87c5e7f6c9e856cf82c3c531255adccbd9fae5c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jun 22 12:42:30 2011 -0400 + + XORG_WITH_XSLTPROC: warn at development time rather than config time + + Catching up unimplemented features should be done earlier by the developer + during autoconf rather than during configure. + + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit f3332a7214af43878691b4f4876c39dc7d546266 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jun 22 10:02:28 2011 -0400 + + Add XORG_WITH_PERL macro + + Following the same pattern as XMLTO and friends. + Allows all modules to use the same interface, variables + and options to check for perl. + Perl is used in libX11 and xserver. + + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit b927af52e8a3384126bfe709b725f6c5bad4ba34 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jun 22 09:04:32 2011 -0400 + + XORG_WITH_FOP: add minimum version checking support + + Adding this feature is motivated by a bug in fop 0.95 where + fop crashes in the presence of some characters like the latin capital + sharp s. Fop version 1.0 works correctly. + + This is the same feature found in XMLTO and the likes. + In the macro public interface there is a shift in parameter position + for the DEFAULT parameter. Doing development on older libraries + (point releases on older versions) will still work the same way as + the "no" value will be interpreted as the minimum version. It won't + be found, so fop will be disabled anyway. + + Only libX11 has used XORG_WITH_FOP(no) and will be changed with a version + bump on util-macros. + + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 45c7d622657d295b2c02a46061765827ea37f00f +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jun 1 08:59:53 2011 -0400 + + XORG_PROG_RAWCPP: use AC_LANG_SOURCE to prevent warnings + + The source for the AC_LANG_CONFTEST should be passed to AC_LANG_SOURCE + to satisfy the more stringent testing done by autoconf 2.68. + It is available in autoconf 2.60 where AC_LANG_DEFINES_PROVIDED is not. + + Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 10a865fa671382dce50f7e49624ca5a730372d08 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri May 27 19:01:13 2011 -0700 + + Version bump: 1.14.0 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e03a5cb9f313c6f5de3edc46327eb18b300b92c2 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat May 14 09:10:13 2011 -0700 + + Add AC_LANG_DEFINES_PROVIDED to XORG_RAW_CPP to silence autoconf warnings + + Since we're intentionally doing a special case to just check cpp output, + and not a full program compilation, add the magic macro to silence: + + configure.ac:46: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body + ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... + aclocal.m4:1077: XORG_PROG_RAWCPP is expanded from... + configure.ac:46: the top level + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 61f5a48a74680c316bee2bf93d6ef5d50a688f22 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon May 2 16:52:26 2011 -0700 + + XORG_STRICT_OPTION: add -Werror=attributes to STRICT_CFLAGS for gcc + + Flags unknown attributes as errors, if -Werror=attributes is supported. + (The -Werror=* option was first spotted in gcc 4.2.0 manuals.) + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Jeremy Huddleston <jeremyhu(a)apple.com> + +commit 8a556afbe7ff81987597ca88e315fe66f10e4adc +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Apr 25 20:31:33 2011 -0700 + + Make XORG_STRICT_OPTION always set STRICT_CFLAGS + + Still only adds it to CWARNFLAGS if --enable-strict-compilation is + passed, but sets the variable with the right flags for the compiler + so it's available for other checks in configure scripts. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Jeremy Huddleston <jeremyhu(a)apple.com> + Reviewed-by: Ian Romanick <ian.d.romanick(a)intel.com> + Reviewed-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit ef7824119ede1d491936ef1715296b47419f4c9c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Apr 25 20:26:48 2011 -0700 + + Create XORG_COMPILER_BRAND macro to centralize compiler checks + + Check for gcc vs. intel vs. sun in one place, instead of + continuing to grow more places the check is replicated. + + Add clang check here too, as it's now seeing a lot of use to build X. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Jeremy Huddleston <jeremyhu(a)apple.com> + Reviewed-by: Ian Romanick <ian.d.romanick(a)intel.com> + Reviewed-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 5bb0cddcc5359d764015299021718f42b0a4055c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Mar 14 20:12:36 2011 -0400 + + Version bump: 1.13.0 + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 700ecdc16426c14e649439138e8e40cdc41fe1c1 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Mar 9 18:53:43 2011 -0500 + + XORG_LD_WRAP: check if linker supports -wrap + + Used mainly by test cases using a wrapper function. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 380074140f7b1e3f8ea006a4b1d928d23706b81d +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Mar 9 10:53:49 2011 -0500 + + XORG_WITH_GLIB: check for the GLib package + + XORG_WITH_GLIB([MIN-VERSION], [DEFAULT]) + ---------------------------------------- + Minimum version: 1.13.0 + + GLib is a library which provides advanced data structures and functions. + This macro enables a module to test for the presence of Glib. + + When used in conjunction with XORG_ENABLE_UNIT_TESTS, use both AM_CONDITIONAL + ENABLE_UNIT_TESTS and HAVE_GLIB. + Glib may be used for purpose other than testing + + Package builders should use --without-glib to ensure it does not get pulled in. + Unit tests may or may not use GLib. + + Developers should use --with-glib to error out if GLib is missing. + + Interface to module: + HAVE_GLIB: used in makefiles to conditionally build targets + with_glib: used in configure.ac to know if GLib has been found + --with-glib: 'yes' user instructs the module to use glib + 'no' user instructs the module not to use glib + + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 78af2b882e01b17e38d1361a4a58b7768bb59bec +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Mar 9 07:10:18 2011 -0500 + + XORG_ENABLE_UNIT_TESTS: add support for unit testing + + This macro enables a builder to enable/disable unit testing + It makes no assumption about the test cases implementation + Test cases may or may not use Automake "Support for test suites" + They may or may not use the software utility library GLib + + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 1218d7e6ed064e0c534a01caf013cff666cb44bf +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Feb 25 16:58:10 2011 -0500 + + Version bump: 1.12.0 + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit b22ce580bcc8343b880f19cc7f1c6bea176c8f13 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Jan 29 16:17:09 2011 -0500 + + XORG_WITH_XSLTPROC: add XSLT processor command line tool + + The primary use will be for DocBook/XML cross links database generation. + + XSLT (Extensible Stylesheet Language Transformations) is a declarative, + XML-based language used for the transformation of XML documents. + The xsltproc command line tool is for applying XSLT stylesheets + to XML documents. + + It is used under the cover by xmlto to generate html files from DocBook/XML. + The XSLT processor is often used as a standalone tool for transformations. + It should not be assumed that it is used only to work with documnetation. + + Tested-by: Matt Dew <marcoz(a)osource.org> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 7370b0b3f0308aec2a32012eddb2f0761d5fe399 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Dec 5 01:25:11 2010 -0800 + + Use AC_LANG_PROGRAM in XORG_CHECK_MALLOC_ZERO to clear autoconf-2.68 warnings + + configure.ac:126: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body + ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... + ../../lib/autoconf/general.m4:2730: _AC_RUN_IFELSE is expanded from... + ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... + ../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from... + aclocal.m4:1952: XORG_CHECK_MALLOC_ZERO is expanded from... + configure.ac:126: the top level + + Also, calloc() takes two arguments; and all of them return void *, + not char *; as the compiler points out when you #include <stdlib.h> + instead of faking it badly. (And sometimes when you don't, due to + compiler builtin versions of the functions.) + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Matt Turner <mattst88(a)gmail.com> + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Reviewed-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 04030cbca37c04c48161debc0cade6db00cb347b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Nov 6 20:50:06 2010 -0400 + + XORG_ENABLE_DOCS: Fix "Enable building the documentation (yes: yes)" + + The quoting did not prevent the m4 defined variable "default" + to replace the text string "default" in the help text. + + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + commit ce32345589050b17b23b18157f95f060f4c776a3 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Fri Oct 29 20:43:53 2010 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.11.0/configure new/util-macros-1.15.0/configure --- old/util-macros-1.11.0/configure 2010-10-30 05:44:35.000000000 +0200 +++ new/util-macros-1.15.0/configure 2011-06-23 14:06:38.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for util-macros 1.11.0. +# Generated by GNU Autoconf 2.68 for util-macros 1.15.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -560,8 +560,8 @@ # Identity of this package. PACKAGE_NAME='util-macros' PACKAGE_TARNAME='util-macros' -PACKAGE_VERSION='1.11.0' -PACKAGE_STRING='util-macros 1.11.0' +PACKAGE_VERSION='1.15.0' +PACKAGE_STRING='util-macros 1.15.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1183,7 +1183,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures util-macros 1.11.0 to adapt to many kinds of systems. +\`configure' configures util-macros 1.15.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1249,7 +1249,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of util-macros 1.11.0:";; + short | recursive ) echo "Configuration of util-macros 1.15.0:";; esac cat <<\_ACEOF @@ -1323,7 +1323,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -util-macros configure 1.11.0 +util-macros configure 1.15.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1340,7 +1340,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by util-macros $as_me 1.11.0, which was +It was created by util-macros $as_me 1.15.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2156,7 +2156,7 @@ # Define the identity of the package. PACKAGE='util-macros' - VERSION='1.11.0' + VERSION='1.15.0' cat >>confdefs.h <<_ACEOF @@ -2837,7 +2837,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by util-macros $as_me 1.11.0, which was +This file was extended by util-macros $as_me 1.15.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2890,7 +2890,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -util-macros config.status 1.11.0 +util-macros config.status 1.15.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.11.0/configure.ac new/util-macros-1.15.0/configure.ac --- old/util-macros-1.11.0/configure.ac 2010-10-30 05:42:30.000000000 +0200 +++ new/util-macros-1.15.0/configure.ac 2011-06-23 14:02:56.000000000 +0200 @@ -23,7 +23,7 @@ AC_PREREQ([2.60]) AC_INIT([util-macros], - [1.11.0], + [1.15.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [util-macros]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.11.0/xorg-macros.m4.in new/util-macros-1.15.0/xorg-macros.m4.in --- old/util-macros-1.11.0/xorg-macros.m4.in 2010-10-30 05:42:04.000000000 +0200 +++ new/util-macros-1.15.0/xorg-macros.m4.in 2011-06-23 02:31:19.000000000 +0200 @@ -64,7 +64,7 @@ # which is not the best choice for supporting other OS'es, but covers most # of the ones we need for now. AC_MSG_CHECKING([if $RAWCPP requires -undef]) -AC_LANG_CONFTEST([Does cpp redefine unix ?]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -82,7 +82,7 @@ rm -f conftest.$ac_ext AC_MSG_CHECKING([if $RAWCPP requires -traditional]) -AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -432,6 +432,123 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ]) # XORG_WITH_XMLTO +# XORG_WITH_XSLTPROC([MIN-VERSION], [DEFAULT]) +# -------------------------------------------- +# Minimum version: 1.12.0 +# Minimum version for optional DEFAULT argument: 1.12.0 +# +# XSLT (Extensible Stylesheet Language Transformations) is a declarative, +# XML-based language used for the transformation of XML documents. +# The xsltproc command line tool is for applying XSLT stylesheets to XML documents. +# It is used under the cover by xmlto to generate html files from DocBook/XML. +# The XSLT processor is often used as a standalone tool for transformations. +# It should not be assumed that this tool is used only to work with documnetation. +# When DEFAULT is not specified, --with-xsltproc assumes 'auto'. +# +# Interface to module: +# HAVE_XSLTPROC: used in makefiles to conditionally generate documentation +# XSLTPROC: returns the path of the xsltproc program found +# returns the path set by the user in the environment +# --with-xsltproc: 'yes' user instructs the module to use xsltproc +# 'no' user instructs the module not to use xsltproc +# have_xsltproc: returns yes if xsltproc found in PATH or no +# +# If the user sets the value of XSLTPROC, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_XSLTPROC],[ +AC_ARG_VAR([XSLTPROC], [Path to xsltproc command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for xsltproc MIN-VERSION is not implemented])]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(xsltproc, + AS_HELP_STRING([--with-xsltproc], + [Use xsltproc for the transformation of XML documents (default: ]_defopt[)]), + [use_xsltproc=$withval], [use_xsltproc=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_xsltproc" = x"auto"; then + AC_PATH_PROG([XSLTPROC], [xsltproc]) + if test "x$XSLTPROC" = "x"; then + AC_MSG_WARN([xsltproc not found - cannot transform XML documents]) + have_xsltproc=no + else + have_xsltproc=yes + fi +elif test "x$use_xsltproc" = x"yes" ; then + AC_PATH_PROG([XSLTPROC], [xsltproc]) + if test "x$XSLTPROC" = "x"; then + AC_MSG_ERROR([--with-xsltproc=yes specified but xsltproc not found in PATH]) + fi + have_xsltproc=yes +elif test "x$use_xsltproc" = x"no" ; then + if test "x$XSLTPROC" != "x"; then + AC_MSG_WARN([ignoring XSLTPROC environment variable since --with-xsltproc=no was specified]) + fi + have_xsltproc=no +else + AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no']) +fi + +AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes]) +]) # XORG_WITH_XSLTPROC + +# XORG_WITH_PERL([MIN-VERSION], [DEFAULT]) +# ---------------------------------------- +# Minimum version: 1.15.0 +# +# PERL (Practical Extraction and Report Language) is a language optimized for +# scanning arbitrary text files, extracting information from those text files, +# and printing reports based on that information. +# +# When DEFAULT is not specified, --with-perl assumes 'auto'. +# +# Interface to module: +# HAVE_PERL: used in makefiles to conditionally scan text files +# PERL: returns the path of the perl program found +# returns the path set by the user in the environment +# --with-perl: 'yes' user instructs the module to use perl +# 'no' user instructs the module not to use perl +# have_perl: returns yes if perl found in PATH or no +# +# If the user sets the value of PERL, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_PERL],[ +AC_ARG_VAR([PERL], [Path to perl command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for perl MIN-VERSION is not implemented])]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(perl, + AS_HELP_STRING([--with-perl], + [Use perl for extracting information from files (default: ]_defopt[)]), + [use_perl=$withval], [use_perl=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_perl" = x"auto"; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_WARN([perl not found - cannot extract information and report]) + have_perl=no + else + have_perl=yes + fi +elif test "x$use_perl" = x"yes" ; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_ERROR([--with-perl=yes specified but perl not found in PATH]) + fi + have_perl=yes +elif test "x$use_perl" = x"no" ; then + if test "x$PERL" != "x"; then + AC_MSG_WARN([ignoring PERL environment variable since --with-perl=no was specified]) + fi + have_perl=no +else + AC_MSG_ERROR([--with-perl expects 'yes' or 'no']) +fi + +AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes]) +]) # XORG_WITH_PERL + # XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) # ---------------- # Minimum version: 1.5.0 @@ -677,10 +794,11 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) ]) # XORG_WITH_GROFF -# XORG_WITH_FOP([DEFAULT]) -# ---------------- +# XORG_WITH_FOP([MIN-VERSION], [DEFAULT]) +# --------------------------------------- # Minimum version: 1.6.0 # Minimum version for optional DEFAULT argument: 1.11.0 +# Minimum version for optional MIN-VERSION argument: 1.15.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the @@ -700,7 +818,7 @@ # AC_DEFUN([XORG_WITH_FOP],[ AC_ARG_VAR([FOP], [Path to fop command]) -m4_define([_defopt], m4_default([$1], [auto])) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(fop, AS_HELP_STRING([--with-fop], [Use fop to regenerate documentation (default: ]_defopt[)]), @@ -729,6 +847,22 @@ else AC_MSG_ERROR([--with-fop expects 'yes' or 'no']) fi + +# Test for a minimum version of fop, if provided. +m4_ifval([$1], +[if test "$have_fop" = yes; then + # scrape the fop version + AC_MSG_CHECKING([for fop minimum version]) + fop_version=`$FOP -version 2>/dev/null | cut -d' ' -f3` + AC_MSG_RESULT([$fop_version]) + AS_VERSION_COMPARE([$fop_version], [$1], + [if test "x$use_fop" = xauto; then + AC_MSG_WARN([fop version $fop_version found, but $1 needed]) + have_fop=no + else + AC_MSG_ERROR([fop version $fop_version found, but $1 needed]) + fi]) +fi]) AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP @@ -811,12 +945,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DOCS],[ -m4_define([default], m4_default([$1], [yes])) +m4_define([docs_default], m4_default([$1], [yes])) AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs], - [Enable building the documentation (default: ]default[)]), - [build_docs=$enableval], [build_docs=]default) -m4_undefine([default]) + [Enable building the documentation (default: ]docs_default[)]), + [build_docs=$enableval], [build_docs=]docs_default) +m4_undefine([docs_default]) AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) AC_MSG_CHECKING([whether to build documentation]) AC_MSG_RESULT([$build_docs]) @@ -888,6 +1022,194 @@ AC_MSG_RESULT([$build_specs]) ]) # XORG_ENABLE_SPECS +# XORG_ENABLE_UNIT_TESTS (enable_unit_tests=auto) +# ---------------------------------------------- +# Minimum version: 1.13.0 +# +# This macro enables a builder to enable/disable unit testing +# It makes no assumption about the test cases implementation +# Test cases may or may not use Automake "Support for test suites" +# They may or may not use the software utility library GLib +# +# When used in conjunction with XORG_WITH_GLIB, use both AM_CONDITIONAL +# ENABLE_UNIT_TESTS and HAVE_GLIB. Not all unit tests may use glib. +# The variable enable_unit_tests is used by other macros in this file. +# +# Interface to module: +# ENABLE_UNIT_TESTS: used in makefiles to conditionally build tests +# enable_unit_tests: used in configure.ac for additional configuration +# --enable-unit-tests: 'yes' user instructs the module to build tests +# 'no' user instructs the module not to build tests +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_UNIT_TESTS],[ +AC_BEFORE([$0], [XORG_WITH_GLIB]) +AC_BEFORE([$0], [XORG_LD_WRAP]) +m4_define([_defopt], m4_default([$1], [auto])) +AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests], + [Enable building unit test cases (default: ]_defopt[)]), + [enable_unit_tests=$enableval], [enable_unit_tests=]_defopt) +m4_undefine([_defopt]) +AM_CONDITIONAL(ENABLE_UNIT_TESTS, [test "x$enable_unit_tests" != xno]) +AC_MSG_CHECKING([whether to build unit test cases]) +AC_MSG_RESULT([$enable_unit_tests]) +]) # XORG_ENABLE_UNIT_TESTS + +# XORG_WITH_GLIB([MIN-VERSION], [DEFAULT]) +# ---------------------------------------- +# Minimum version: 1.13.0 +# +# GLib is a library which provides advanced data structures and functions. +# This macro enables a module to test for the presence of Glib. +# +# When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit testing. +# Otherwise the value of $enable_unit_tests is blank. +# +# Interface to module: +# HAVE_GLIB: used in makefiles to conditionally build targets +# with_glib: used in configure.ac to know if GLib has been found +# --with-glib: 'yes' user instructs the module to use glib +# 'no' user instructs the module not to use glib +# +AC_DEFUN([XORG_WITH_GLIB],[ +AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(glib, AS_HELP_STRING([--with-glib], + [Use GLib library for unit testing (default: ]_defopt[)]), + [with_glib=$withval], [with_glib=]_defopt) +m4_undefine([_defopt]) + +have_glib=no +# Do not probe GLib if user explicitly disabled unit testing +if test "x$enable_unit_tests" != x"no"; then + # Do not probe GLib if user explicitly disabled it + if test "x$with_glib" != x"no"; then + m4_ifval( + [$1], + [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $1], [have_glib=yes], [have_glib=no])], + [PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])] + ) + fi +fi + +# Not having GLib when unit testing has been explicitly requested is an error +if test "x$enable_unit_tests" = x"yes"; then + if test "x$have_glib" = x"no"; then + AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found]) + fi +fi + +# Having unit testing disabled when GLib has been explicitly requested is an error +if test "x$enable_unit_tests" = x"no"; then + if test "x$with_glib" = x"yes"; then + AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found]) + fi +fi + +# Not having GLib when it has been explicitly requested is an error +if test "x$with_glib" = x"yes"; then + if test "x$have_glib" = x"no"; then + AC_MSG_ERROR([--with-glib=yes specified but glib-2.0 not found]) + fi +fi + +AM_CONDITIONAL([HAVE_GLIB], [test "$have_glib" = yes]) +]) # XORG_WITH_GLIB + +# XORG_LD_WRAP +# ------------ +# Minimum version: 1.13.0 +# +# Check if linker supports -wrap, passed via compiler flags +# +# When used with ENABLE_UNIT_TESTS, it is assumed -wrap is used for unit testing. +# Otherwise the value of $enable_unit_tests is blank. +# +AC_DEFUN([XORG_LD_WRAP],[ +XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no]) +# Not having ld wrap when unit testing has been explicitly requested is an error +if test "x$enable_unit_tests" = x"yes"; then + if test "x$have_ld_wrap" = x"no"; then + AC_MSG_ERROR([--enable-unit-tests=yes specified but ld -wrap support is not available]) + fi +fi +AM_CONDITIONAL([HAVE_LD_WRAP], [test "$have_ld_wrap" = yes]) +# +]) # XORG_LD_WRAP + +# XORG_CHECK_LINKER_FLAGS +# ----------------------- +# SYNOPSIS +# +# XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE]) +# +# DESCRIPTION +# +# Check whether the given linker FLAGS work with the current language's +# linker, or whether they give an error. +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# NOTE: Based on AX_CHECK_COMPILER_FLAGS. +# +# LICENSE +# +# Copyright (c) 2009 Mike Frysinger <vapier(a)gentoo.org> +# Copyright (c) 2009 Steven G. Johnson <stevenj(a)alum.mit.edu> +# Copyright (c) 2009 Matteo Frigo +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well.# +AC_DEFUN([XORG_CHECK_LINKER_FLAGS], +[AC_MSG_CHECKING([whether the linker accepts $1]) +dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname: +AS_LITERAL_IF([$1], + [AC_CACHE_VAL(AS_TR_SH(xorg_cv_linker_flags_[$1]), [ + ax_save_FLAGS=$LDFLAGS + LDFLAGS="$1" + AC_LINK_IFELSE([AC_LANG_PROGRAM()], + AS_TR_SH(xorg_cv_linker_flags_[$1])=yes, + AS_TR_SH(xorg_cv_linker_flags_[$1])=no) + LDFLAGS=$ax_save_FLAGS])], + [ax_save_FLAGS=$LDFLAGS + LDFLAGS="$1" + AC_LINK_IFELSE([AC_LANG_PROGRAM()], + eval AS_TR_SH(xorg_cv_linker_flags_[$1])=yes, + eval AS_TR_SH(xorg_cv_linker_flags_[$1])=no) + LDFLAGS=$ax_save_FLAGS]) +eval xorg_check_linker_flags=$AS_TR_SH(xorg_cv_linker_flags_[$1]) +AC_MSG_RESULT($xorg_check_linker_flags) +if test "x$xorg_check_linker_flags" = xyes; then + m4_default([$2], :) +else + m4_default([$3], :) +fi +]) # XORG_CHECK_LINKER_FLAGS + # XORG_CHECK_MALLOC_ZERO # ---------------------- # Minimum version: 1.0.0 @@ -904,18 +1226,16 @@ AC_MSG_CHECKING([whether malloc(0) returns NULL]) if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then - AC_RUN_IFELSE([ -char *malloc(); -char *realloc(); -char *calloc(); -main() { + AC_RUN_IFELSE([AC_LANG_PROGRAM([ +#include <stdlib.h> +],[ char *m0, *r0, *c0, *p; m0 = malloc(0); p = malloc(10); r0 = realloc(p,0); - c0 = calloc(0); - exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); -}], + c0 = calloc(0,10); + exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1); +])], [MALLOC_ZERO_RETURNS_NULL=yes], [MALLOC_ZERO_RETURNS_NULL=no], [MALLOC_ZERO_RETURNS_NULL=yes]) @@ -1041,6 +1361,23 @@ ]) # XORG_LINT_LIBRARY +# XORG_COMPILER_BRAND +# ------------------- +# Minimum version: 1.14.0 +# +# Checks for various brands of compilers and sets flags as appropriate: +# GNU gcc - relies on AC_PROG_CC (via AC_PROG_CC_C99) to set GCC to "yes" +# clang compiler - sets CLANGCC to "yes" +# Intel compiler - sets INTELCC to "yes" +# Sun/Oracle Solaris Studio cc - sets SUNCC to "yes" +# +AC_DEFUN([XORG_COMPILER_BRAND], [ +AC_REQUIRE([AC_PROG_CC_C99]) +AC_CHECK_DECL([__clang__], [CLANGCC="yes"], [CLANGCC="no"]) +AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) +AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) +]) # XORG_COMPILER_BRAND + # XORG_CWARNFLAGS # --------------- # Minimum version: 1.2.0 @@ -1049,6 +1386,7 @@ # AC_DEFUN([XORG_CWARNFLAGS], [ AC_REQUIRE([AC_PROG_CC_C99]) +AC_REQUIRE([XORG_COMPILER_BRAND]) if test "x$GCC" = xyes ; then CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ @@ -1059,7 +1397,6 @@ ;; esac else - AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) if test "x$SUNCC" = "xyes"; then CWARNFLAGS="-v" fi @@ -1071,28 +1408,43 @@ # ----------------------- # Minimum version: 1.3.0 # -# Add configure option to enable strict compilation +# Add configure option to enable strict compilation flags, such as treating +# warnings as fatal errors. +# If --enable-strict-compilation is passed to configure, adds strict flags to +# $CWARNFLAGS. +# +# Starting in 1.14.0 also exports $STRICT_CFLAGS for use in other tests or +# when strict compilation is unconditionally desired. AC_DEFUN([XORG_STRICT_OPTION], [ # If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89 AC_REQUIRE([AC_PROG_CC_C99]) +AC_REQUIRE([XORG_COMPILER_BRAND]) AC_REQUIRE([XORG_CWARNFLAGS]) AC_ARG_ENABLE(strict-compilation, AS_HELP_STRING([--enable-strict-compilation], [Enable all warnings from compiler and make them errors (default: disabled)]), [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no]) +if test "x$GCC" = xyes ; then + STRICT_CFLAGS="-pedantic -Werror" + # Add -Werror=attributes if supported (gcc 4.2 & later) + AC_MSG_CHECKING([if $CC supports -Werror=attributes]) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([return 0;])], + [STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) + CFLAGS="$save_CFLAGS" +elif test "x$SUNCC" = "xyes"; then + STRICT_CFLAGS="-errwarn" +elif test "x$INTELCC" = "xyes"; then + STRICT_CFLAGS="-Werror" +fi if test "x$STRICT_COMPILE" = "xyes"; then - AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) - AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) - if test "x$GCC" = xyes ; then - STRICT_CFLAGS="-pedantic -Werror" - elif test "x$SUNCC" = "xyes"; then - STRICT_CFLAGS="-errwarn" - elif test "x$INTELCC" = "xyes"; then - STRICT_CFLAGS="-Werror" - fi + CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" fi -CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" +AC_SUBST([STRICT_CFLAGS]) AC_SUBST([CWARNFLAGS]) ]) # XORG_STRICT_OPTION ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ppl for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '11

01 Sep '11

Hello community, here is the log from the commit of package ppl for openSUSE:Factory checked in at Thu Sep 1 12:00:17 CEST 2011. -------- --- ppl/ppl.changes 2011-03-03 15:36:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/ppl/ppl.changes 2011-08-31 15:47:11.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 31 13:44:35 UTC 2011 - rguenther(a)suse.com + +- Fix fixed baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppl-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.GsbdDF/_old 2011-09-01 11:59:50.000000000 +0200 +++ /var/tmp/diff_new_pack.GsbdDF/_new 2011-09-01 11:59:50.000000000 +0200 @@ -19,7 +19,7 @@ Name: ppl-testsuite Version: 0.11.2 -Release: 1 +Release: 2 Summary: The Parma Polyhedra Library Group: Development/Libraries/C and C++ License: GPLv3+ ++++++ ppl.spec ++++++ --- /var/tmp/diff_new_pack.GsbdDF/_old 2011-09-01 11:59:50.000000000 +0200 +++ /var/tmp/diff_new_pack.GsbdDF/_new 2011-09-01 11:59:50.000000000 +0200 @@ -19,7 +19,7 @@ Name: ppl Version: 0.11.2 -Release: 1 +Release: 4 Summary: The Parma Polyhedra Library Group: Development/Libraries/C and C++ License: GPLv3+ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.GsbdDF/_old 2011-09-01 11:59:50.000000000 +0200 +++ /var/tmp/diff_new_pack.GsbdDF/_new 2011-09-01 11:59:50.000000000 +0200 @@ -4,4 +4,4 @@ requires -ppl-<targettype> requires "libppl9-<targettype> = <version>" requires "libppl_c4-<targettype> = <version>" - requires "gmp-devel-<targettype> >= 5.0" + requires "gmp-devel-<targettype> >= 4.1.3" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libqt4 for openSUSE:11.4
by root＠hilbert.suse.de 01 Sep '11

01 Sep '11

Hello community, here is the log from the commit of package libqt4 for openSUSE:11.4 checked in at Thu Sep 1 10:17:00 CEST 2011. -------- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ libqt4-devel-doc.spec: same change ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.ywULIk/_old 2011-09-01 10:16:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ywULIk/_new 2011-09-01 10:16:22.000000000 +0200 @@ -29,7 +29,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.1 -Release: 3.<RELEASE2> +Release: 8.<RELEASE10> %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.ywULIk/_old 2011-09-01 10:16:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ywULIk/_new 2011-09-01 10:16:22.000000000 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.7.1 -Release: 8.<RELEASE9> +Release: 8.<RELEASE11> %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -342,6 +342,7 @@ %package -n phonon + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -362,6 +363,7 @@ %package -n phonon-devel + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -383,6 +385,7 @@ %package -n libphonon4 + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -404,6 +407,7 @@ %package -n phonon-backend-gstreamer-0_10 + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -425,6 +429,7 @@ %package -n phonon-backend-xine + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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