November 2009 - openSUSE Commits - openSUSE Mailing Lists

commit gcc44 for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package gcc44 for openSUSE:Factory checked in at Mon Nov 23 10:58:29 CET 2009. -------- --- gcc44/cross-avr-gcc44.changes 2009-10-08 15:06:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc44/cross-avr-gcc44.changes 2009-11-04 11:28:54.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Nov 4 11:21:39 CET 2009 - rguenther(a)suse.de + +- Update to gcc-4_4-branch head (r153890). + * includes GCC 4.4.2 release. + +------------------------------------------------------------------- +Tue Nov 3 19:13:10 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- cross-hppa-gcc-icecream-backend.changes: same change cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-spu-gcc.changes: same change cross-spu-gcc-static.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc44.changes: same change libgcj44.changes: same change calling whatdependson for head-i586 Old: ---- classpath-fixes.tar gcc-4.4.1-20090817.tar.bz2 nvl544794.patch New: ---- gcc-4.4.2-20091104.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-avr-gcc44.spec ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:39.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-gcc44 (Version 4.4.1_20090817) +# spec file for package cross-avr-gcc44 (Version 4.4.2_20091104) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -64,8 +64,8 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -Version: 4.4.1_20090817 -Release: 2 +Version: 4.4.2_20091104 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -80,7 +80,6 @@ Source3: gcc44-rpmlintrc Source4: ecj.jar Source5: README.First-for.SuSE.packagers -Source6: classpath-fixes.tar Patch1: gcc-dir-version.patch Patch2: gcc-sles-version.patch Patch3: gcc-noalias-warn.diff @@ -98,7 +97,6 @@ Patch29: build-id.diff Patch30: gcc43-no-unwind-tables.diff Patch31: gcc44-arm-boehm.patch -Patch32: nvl544794.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -148,7 +146,6 @@ %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} -tar xf %{SOURCE6} %patch1 %patch2 %patch3 @@ -170,7 +167,6 @@ %endif %patch30 %patch31 -%patch32 %patch51 %patch55 %patch57 cross-hppa-gcc-icecream-backend.spec: same change cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change cross-spu-gcc.spec: same change cross-spu-gcc-static.spec: same change cross-x86_64-gcc-icecream-backend.spec: same change gcc44.spec: same change libgcj44.spec: same change ++++++ gcc-4.4.1-20090817.tar.bz2 -> gcc-4.4.2-20091104.tar.bz2 ++++++ gcc44/gcc-4.4.1-20090817.tar.bz2 /mounts/work_src_done/STABLE/gcc44/gcc-4.4.2-20091104.tar.bz2 differ: byte 11, line 1 ++++++ gcc44-rename-info-files.patch ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -60,9 +60,9 @@ Index: libgomp/libgomp.texi =================================================================== ---- libgomp/libgomp.texi.orig 2008-07-01 11:33:42.000000000 +0200 -+++ libgomp/libgomp.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -32,7 +32,7 @@ texts being (a) (see below), and with th +--- libgomp/libgomp.texi.orig ++++ libgomp/libgomp.texi +@@ -31,7 +31,7 @@ texts being (a) (see below), and with th @ifinfo @dircategory GNU Libraries @direntry @@ -73,9 +73,9 @@ This manual documents the GNU implementation of the OpenMP API for Index: libgomp/Makefile.am =================================================================== ---- libgomp/Makefile.am.orig 2008-06-11 15:23:21.000000000 +0200 -+++ libgomp/Makefile.am 2008-07-20 13:38:48.000000000 +0200 -@@ -92,16 +92,19 @@ endif +--- libgomp/Makefile.am.orig ++++ libgomp/Makefile.am +@@ -93,16 +93,19 @@ endif all-local: $(STAMP_GENINSRC) @@ -102,9 +102,9 @@ MAINTAINERCLEANFILES = $(srcdir)/libgomp.info Index: libgomp/Makefile.in =================================================================== ---- libgomp/Makefile.in.orig 2008-06-11 15:25:28.000000000 +0200 -+++ libgomp/Makefile.in 2008-07-20 13:38:48.000000000 +0200 -@@ -322,7 +322,8 @@ info_TEXINFOS = libgomp.texi +--- libgomp/Makefile.in.orig ++++ libgomp/Makefile.in +@@ -336,7 +336,8 @@ info_TEXINFOS = libgomp.texi # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO]) @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info @@ -114,7 +114,7 @@ MAINTAINERCLEANFILES = $(srcdir)/libgomp.info all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -1086,15 +1087,16 @@ install-pdf: $(PDFS) +@@ -1100,15 +1101,16 @@ install-pdf: $(PDFS) done all-local: $(STAMP_GENINSRC) @@ -138,8 +138,8 @@ # Otherwise a system limit (for SysV at least) may be exceeded. Index: gcc/doc/cpp.texi =================================================================== ---- gcc/doc/cpp.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/cpp.texi 2008-07-20 13:41:37.000000000 +0200 +--- gcc/doc/cpp.texi.orig ++++ gcc/doc/cpp.texi @@ -52,7 +52,7 @@ This manual contains no Invariant Sectio @ifinfo @dircategory Software development @@ -151,8 +151,8 @@ Index: gcc/doc/cppinternals.texi =================================================================== ---- gcc/doc/cppinternals.texi.orig 2008-02-15 10:52:51.000000000 +0100 -+++ gcc/doc/cppinternals.texi 2008-07-20 13:38:48.000000000 +0200 +--- gcc/doc/cppinternals.texi.orig ++++ gcc/doc/cppinternals.texi @@ -7,7 +7,7 @@ @ifinfo @dircategory Software development @@ -164,9 +164,9 @@ Index: gcc/doc/extend.texi =================================================================== ---- gcc/doc/extend.texi.orig 2008-07-19 13:58:10.000000000 +0200 -+++ gcc/doc/extend.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -11802,7 +11802,7 @@ want to write code that checks whether t +--- gcc/doc/extend.texi.orig ++++ gcc/doc/extend.texi +@@ -12339,7 +12339,7 @@ want to write code that checks whether t test for the GNU compiler the same way as for C programs: check for a predefined macro @code{__GNUC__}. You can also use @code{__GNUG__} to test specifically for GNU C++ (@pxref{Common Predefined Macros,, @@ -177,9 +177,9 @@ * Volatiles:: What constitutes an access to a volatile object. Index: gcc/doc/gcc.texi =================================================================== ---- gcc/doc/gcc.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/gcc.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -65,8 +65,8 @@ included in the section entitled ``GNU F +--- gcc/doc/gcc.texi.orig ++++ gcc/doc/gcc.texi +@@ -65,8 +65,8 @@ Texts being (a) (see below), and with th @ifnottex @dircategory Software development @direntry @@ -201,9 +201,9 @@ * G++ and GCC:: You can compile C or C++ programs. Index: gcc/doc/gccint.texi =================================================================== ---- gcc/doc/gccint.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/gccint.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -51,7 +51,7 @@ included in the section entitled ``GNU F +--- gcc/doc/gccint.texi.orig ++++ gcc/doc/gccint.texi +@@ -51,7 +51,7 @@ Texts being (a) (see below), and with th @ifnottex @dircategory Software development @direntry @@ -223,9 +223,9 @@ This manual is mainly a reference manual rather than a tutorial. It Index: gcc/doc/invoke.texi =================================================================== ---- gcc/doc/invoke.texi.orig 2008-07-19 13:58:10.000000000 +0200 -+++ gcc/doc/invoke.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -7552,7 +7552,7 @@ One of the standard libraries bypassed b +--- gcc/doc/invoke.texi.orig ++++ gcc/doc/invoke.texi +@@ -7942,7 +7942,7 @@ One of the standard libraries bypassed b @option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines that GCC uses to overcome shortcomings of particular machines, or special needs for some languages. @@ -234,7 +234,7 @@ Collection (GCC) Internals}, for more discussion of @file{libgcc.a}.) In most cases, you need @file{libgcc.a} even when you want to avoid -@@ -7560,7 +7560,7 @@ other standard libraries. In other word +@@ -7950,7 +7950,7 @@ other standard libraries. In other word or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well. This ensures that you have no unresolved references to internal GCC library subroutines. (For example, @samp{__main}, used to ensure C++ @@ -243,7 +243,7 @@ GNU Compiler Collection (GCC) Internals}.) @item -pie -@@ -15377,7 +15377,7 @@ Note that you can also specify places to +@@ -16211,7 +16211,7 @@ Note that you can also specify places to @option{-B}, @option{-I} and @option{-L} (@pxref{Directory Options}). These take precedence over places specified using environment variables, which in turn take precedence over those specified by the configuration of GCC@. @@ -252,7 +252,7 @@ GNU Compiler Collection (GCC) Internals}. @table @env -@@ -15532,7 +15532,7 @@ the headers it contains change. +@@ -16366,7 +16366,7 @@ the headers it contains change. A precompiled header file will be searched for when @code{#include} is seen in the compilation. As it searches for the included file @@ -263,8 +263,8 @@ the name specified in the @code{#include} with @samp{.gch} appended. If Index: gcc/doc/libgcc.texi =================================================================== ---- gcc/doc/libgcc.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/libgcc.texi 2008-07-20 13:38:48.000000000 +0200 +--- gcc/doc/libgcc.texi.orig ++++ gcc/doc/libgcc.texi @@ -24,7 +24,7 @@ that needs them. GCC will also generate calls to C library routines, such as @code{memcpy} and @code{memset}, in some cases. The set of routines @@ -276,9 +276,9 @@ mode, not a specific C type. @xref{Machine Modes}, for an explanation Index: gcc/doc/makefile.texi =================================================================== ---- gcc/doc/makefile.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/makefile.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -139,7 +139,7 @@ regardless of how it itself was compiled +--- gcc/doc/makefile.texi.orig ++++ gcc/doc/makefile.texi +@@ -140,7 +140,7 @@ regardless of how it itself was compiled @item profiledbootstrap Builds a compiler with profiling feedback information. For more information, see @@ -289,9 +289,9 @@ Restart a bootstrap, so that everything that was not built with Index: gcc/doc/passes.texi =================================================================== ---- gcc/doc/passes.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/passes.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -192,7 +192,7 @@ rid of it. This pass is located in @fil +--- gcc/doc/passes.texi.orig ++++ gcc/doc/passes.texi +@@ -196,7 +196,7 @@ rid of it. This pass is located in @fil @item Mudflap declaration registration If mudflap (@pxref{Optimize Options,,-fmudflap -fmudflapth @@ -302,8 +302,8 @@ those variable declarations that have their addresses taken, or whose Index: gcc/doc/standards.texi =================================================================== ---- gcc/doc/standards.texi.orig 2008-03-11 11:31:45.000000000 +0100 -+++ gcc/doc/standards.texi 2008-07-20 13:38:48.000000000 +0200 +--- gcc/doc/standards.texi.orig ++++ gcc/doc/standards.texi @@ -223,8 +223,8 @@ have additional useful information. GNAT Reference Manual}, for information on standard conformance and compatibility of the Ada compiler. @@ -317,8 +317,8 @@ for details of compatibility between @command{gcj} and the Java Platform. Index: gcc/java/Make-lang.in =================================================================== ---- gcc/java/Make-lang.in.orig 2008-07-19 13:58:11.000000000 +0200 -+++ gcc/java/Make-lang.in 2008-07-20 13:40:37.000000000 +0200 +--- gcc/java/Make-lang.in.orig ++++ gcc/java/Make-lang.in @@ -126,11 +126,23 @@ java.tags: force etags --include TAGS.sub --include ../TAGS.sub @@ -345,7 +345,7 @@ java.dvi: doc/gcj.dvi JAVA_PDFFILES = doc/gcj.pdf -@@ -189,8 +201,9 @@ java.uninstall: +@@ -190,8 +202,9 @@ java.uninstall: -rm -rf $(DESTDIR)$(man1dir)/gcj-dbtool$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/aot-compile$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/rebuild-gcj-db$(man1ext) @@ -358,9 +358,9 @@ @$(NORMAL_INSTALL) Index: gcc/java/gcj.texi =================================================================== ---- gcc/java/gcj.texi.orig 2008-07-03 10:39:46.000000000 +0200 -+++ gcc/java/gcj.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -56,21 +56,21 @@ man page gfdl(7). +--- gcc/java/gcj.texi.orig ++++ gcc/java/gcj.texi +@@ -55,21 +55,21 @@ man page gfdl(7). @format @dircategory Software development @direntry @@ -389,7 +389,7 @@ Analyze Garbage Collector (GC) memory dumps. * aot-compile: (gcj)Invoking aot-compile. Compile bytecode to native and generate databases. -@@ -160,7 +160,7 @@ and the Info entries for @file{gcj} and +@@ -159,7 +159,7 @@ and the Info entries for @file{gcj} and As @command{gcj} is just another front end to @command{gcc}, it supports many of the same options as gcc. @xref{Option Summary, , Option Summary, @@ -400,8 +400,8 @@ @c man end Index: gcc/fortran/Make-lang.in =================================================================== ---- gcc/fortran/Make-lang.in.orig 2008-07-19 13:58:22.000000000 +0200 -+++ gcc/fortran/Make-lang.in 2008-07-20 13:38:48.000000000 +0200 +--- gcc/fortran/Make-lang.in.orig ++++ gcc/fortran/Make-lang.in @@ -116,7 +116,8 @@ fortran.tags: force cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \ etags --include TAGS.sub --include ../TAGS.sub @@ -412,7 +412,7 @@ fortran.dvi: doc/gfortran.dvi doc/gfc-internals.dvi fortran.html: $(build_htmldir)/gfortran/index.html -@@ -158,10 +159,10 @@ GFORTRAN_TEXI = \ +@@ -165,10 +166,10 @@ GFORTRAN_TEXI = \ $(srcdir)/doc/include/gcc-common.texi \ gcc-vers.texi @@ -425,7 +425,7 @@ -o $@ $<; \ else true; fi -@@ -229,7 +230,7 @@ fortran.install-common: install-finclude +@@ -234,7 +235,7 @@ fortran.install-common: install-finclude fi ; \ fi @@ -434,7 +434,7 @@ fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext) -@@ -247,7 +248,7 @@ fortran.uninstall: +@@ -252,7 +253,7 @@ fortran.uninstall: rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \ rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ @@ -445,9 +445,9 @@ # Clean hooks: Index: gcc/fortran/gfortran.texi =================================================================== ---- gcc/fortran/gfortran.texi.orig 2008-07-01 11:34:00.000000000 +0200 -+++ gcc/fortran/gfortran.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -102,7 +102,7 @@ texts being (a) (see below), and with th +--- gcc/fortran/gfortran.texi.orig ++++ gcc/fortran/gfortran.texi +@@ -101,7 +101,7 @@ Texts being (a) (see below), and with th @ifinfo @dircategory Software development @direntry @@ -458,9 +458,9 @@ the GNU Fortran compiler, (@command{gfortran}). Index: gcc/Makefile.in =================================================================== ---- gcc/Makefile.in.orig 2008-07-20 13:38:35.000000000 +0200 -+++ gcc/Makefile.in 2008-07-20 13:38:48.000000000 +0200 -@@ -3724,8 +3724,27 @@ stmp-install-fixproto: fixproto +--- gcc/Makefile.in.orig ++++ gcc/Makefile.in +@@ -3814,8 +3814,27 @@ stmp-install-fixproto: fixproto doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug @@ -490,7 +490,7 @@ info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo -@@ -3775,21 +3794,41 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE) +@@ -3865,21 +3884,41 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE) # patterns. To use them, put each of the specific targets with its # specific dependencies but no build commands. @@ -539,7 +539,7 @@ -I $(gcc_docdir)/include -o $@ $<; \ fi -@@ -4100,11 +4139,11 @@ install-driver: installdirs xgcc$(exeext +@@ -4190,11 +4229,11 @@ install-driver: installdirs xgcc$(exeext # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir # to do the install. install-info:: doc installdirs \ @@ -556,7 +556,7 @@ lang.install-info $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs -@@ -4305,8 +4344,11 @@ uninstall: lang.uninstall +@@ -4395,8 +4434,11 @@ uninstall: lang.uninstall -rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/protoize$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/unprotoize$(man1ext) @@ -572,9 +572,9 @@ # contains global variables that all the testsuites will use. Index: gcc/doc/install.texi =================================================================== ---- gcc/doc/install.texi.orig 2008-07-19 13:58:10.000000000 +0200 -+++ gcc/doc/install.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -96,7 +96,7 @@ Free Documentation License}''. +--- gcc/doc/install.texi.orig ++++ gcc/doc/install.texi +@@ -97,7 +97,7 @@ Free Documentation License}''. @end ifinfo @dircategory Software development @direntry @@ -585,9 +585,9 @@ @c Part 3 Titlepage and Copyright Index: gcc/ada/gnat-style.texi =================================================================== ---- gcc/ada/gnat-style.texi.orig 2007-10-29 12:59:35.000000000 +0100 -+++ gcc/ada/gnat-style.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -31,7 +31,7 @@ +--- gcc/ada/gnat-style.texi.orig ++++ gcc/ada/gnat-style.texi +@@ -31,7 +31,7 @@ Texts. A copy of the license is include @dircategory Software development @direntry @@ -598,9 +598,9 @@ @macro syntax{element} Index: gcc/ada/gnat_rm.texi =================================================================== ---- gcc/ada/gnat_rm.texi.orig 2008-07-01 11:33:57.000000000 +0200 -+++ gcc/ada/gnat_rm.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -30,7 +30,7 @@ +--- gcc/ada/gnat_rm.texi.orig ++++ gcc/ada/gnat_rm.texi +@@ -38,7 +38,7 @@ included in the section entitled ``GNU F @dircategory GNU Ada tools @direntry @@ -608,4 +608,4 @@ +* GNAT Reference Manual: (gnat_rm-4.4). Reference Manual for GNU Ada tools. @end direntry - @copying + @titlepage ++++++ gcc-dir-version.patch ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -1,133 +1,83 @@ Index: gcc/Makefile.in =================================================================== -*** gcc/Makefile.in (revision 130135) ---- gcc/Makefile.in (working copy) -*************** GTM_H = tm.h $(tm_file_list) -*** 726,737 **** - TM_H = $(GTM_H) insn-constants.h insn-flags.h options.h - - # Variables for version information. -! BASEVER := $(srcdir)/BASE-VER # 4.x.y - DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, "" - DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty - REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX] - - BASEVER_c := $(shell cat $(BASEVER)) - DEVPHASE_c := $(shell cat $(DEVPHASE)) - DATESTAMP_c := $(shell cat $(DATESTAMP)) - ---- 726,739 ---- - TM_H = $(GTM_H) insn-constants.h insn-flags.h options.h - - # Variables for version information. -! BASEVER := $(srcdir)/BASE-VER # 4.x -! FULLVER := $(srcdir)/FULL-VER # 4.x.y - DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, "" - DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty - REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX] - - BASEVER_c := $(shell cat $(BASEVER)) -+ FULLVER_c := $(shell cat $(FULLVER)) - DEVPHASE_c := $(shell cat $(DEVPHASE)) - DATESTAMP_c := $(shell cat $(DATESTAMP)) - -*************** version := $(BASEVER_c) -*** 749,754 **** ---- 751,757 ---- - # (i.e. if DEVPHASE_c is empty). The space immediately after the - # comma in the $(if ...) constructs is significant - do not remove it. - BASEVER_s := "\"$(BASEVER_c)\"" -+ FULLVER_s := "\"$(FULLVER_c)\"" - DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\"" - DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\"" - PKGVERSION_s:= "\"@PKGVERSION@\"" -*************** gcc-options.o: options.c $(CONFIG_H) $(S -*** 1912,1923 **** - dumpvers: dumpvers.c - - ifdef REVISION_s -! version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) - else -! version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) - endif - $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ -! -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ - -DREVISION=$(REVISION_s) \ - -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ - -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION) ---- 1915,1926 ---- - dumpvers: dumpvers.c - - ifdef REVISION_s -! version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) - else -! version.o: version.c version.h $(DATESTAMP) $(FULLVER) $(DEVPHASE) - endif - $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ -! -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ - -DREVISION=$(REVISION_s) \ - -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ - -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION) +--- gcc/Makefile.in.orig ++++ gcc/Makefile.in +@@ -753,12 +753,14 @@ GTM_H = tm.h $(tm_file_list) + TM_H = $(GTM_H) insn-constants.h insn-flags.h options.h + + # Variables for version information. +-BASEVER := $(srcdir)/BASE-VER # 4.x.y ++BASEVER := $(srcdir)/BASE-VER # 4.x ++FULLVER := $(srcdir)/FULL-VER # 4.x.y + DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, "" + DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty + REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX] + + BASEVER_c := $(shell cat $(BASEVER)) ++FULLVER_c := $(shell cat $(FULLVER)) + DEVPHASE_c := $(shell cat $(DEVPHASE)) + DATESTAMP_c := $(shell cat $(DATESTAMP)) + +@@ -776,6 +778,7 @@ version := $(BASEVER_c) + # (i.e. if DEVPHASE_c is empty). The space immediately after the + # comma in the $(if ...) constructs is significant - do not remove it. + BASEVER_s := "\"$(BASEVER_c)\"" ++FULLVER_s := "\"$(FULLVER_c)\"" + DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\"" + DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\"" + PKGVERSION_s:= "\"@PKGVERSION@\"" +@@ -2005,12 +2008,12 @@ gcc-options.o: options.c $(CONFIG_H) $(S + dumpvers: dumpvers.c + + ifdef REVISION_s +-version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) ++version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) + else +-version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) ++version.o: version.c version.h $(DATESTAMP) $(FULLVER) $(DEVPHASE) + endif + $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ +- -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ ++ -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ + -DREVISION=$(REVISION_s) \ + -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ + -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION) Index: libjava/Makefile.am =================================================================== -*** libjava/Makefile.am (revision 130144) ---- libjava/Makefile.am (working copy) -*************** endif BUILD_ECJ1 -*** 473,479 **** - install-data-local: - $(PRE_INSTALL) - ## Install the .pc file. -! @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ - file="libgcj-$${pc_version}.pc"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ - echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ ---- 473,479 ---- - install-data-local: - $(PRE_INSTALL) - ## Install the .pc file. -! @pc_version=`echo $(GCJVERSION)`; \ - file="libgcj-$${pc_version}.pc"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ - echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ +--- libjava/Makefile.am.orig ++++ libjava/Makefile.am +@@ -524,7 +524,7 @@ install_data_local_split = 50 + install-data-local: + $(PRE_INSTALL) + ## Install the .pc file. +- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ ++ @pc_version=`echo $(GCJVERSION)`; \ + file="libgcj-$${pc_version}.pc"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ + echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ Index: libjava/Makefile.in =================================================================== -*** libjava/Makefile.in (revision 130144) ---- libjava/Makefile.in (working copy) -*************** install-exec-hook: install-toolexeclibLT -*** 11878,11884 **** - - install-data-local: - $(PRE_INSTALL) -! @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ - file="libgcj-$${pc_version}.pc"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ - echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ ---- 11878,11884 ---- - - install-data-local: - $(PRE_INSTALL) -! @pc_version=`echo $(GCJVERSION)`; \ - file="libgcj-$${pc_version}.pc"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ - echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ +--- libjava/Makefile.in.orig ++++ libjava/Makefile.in +@@ -12384,7 +12384,7 @@ install-exec-hook: install-binPROGRAMS i + @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext) + install-data-local: + $(PRE_INSTALL) +- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ ++ @pc_version=`echo $(GCJVERSION)`; \ + file="libgcj-$${pc_version}.pc"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ + echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ Index: libjava/testsuite/lib/libjava.exp =================================================================== -*** libjava/testsuite/lib/libjava.exp (revision 131902) ---- libjava/testsuite/lib/libjava.exp (working copy) -*************** proc libjava_init { args } { -*** 168,174 **** - - set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] - regexp " version \[^\n\r\]*" $text version -! set libjava_version [lindex $version 1] - - verbose "version: $libjava_version" - ---- 168,174 ---- - - set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] - regexp " version \[^\n\r\]*" $text version -! set libjava_version 4.4 - - verbose "version: $libjava_version" - +--- libjava/testsuite/lib/libjava.exp.orig ++++ libjava/testsuite/lib/libjava.exp +@@ -168,7 +168,7 @@ proc libjava_init { args } { + + set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] + regexp " version \[^\n\r\]*" $text version +- set libjava_version [lindex $version 1] ++ set libjava_version 4.4 + + verbose "version: $libjava_version" + ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -132,7 +132,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ -Version: 4.4.1_20090817 +Version: 4.4.2_20091104 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -163,7 +163,6 @@ Source3: gcc44-rpmlintrc Source4: ecj.jar Source5: README.First-for.SuSE.packagers -Source6: classpath-fixes.tar Patch1: gcc-dir-version.patch Patch2: gcc-sles-version.patch Patch3: gcc-noalias-warn.diff @@ -181,7 +180,6 @@ Patch29: build-id.diff Patch30: gcc43-no-unwind-tables.diff Patch31: gcc44-arm-boehm.patch -Patch32: nvl544794.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -855,7 +853,6 @@ %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} -tar xf %{SOURCE6} %patch1 %patch2 %patch3 @@ -877,7 +874,6 @@ %endif %patch30 %patch31 -%patch32 %patch51 %patch55 %patch57 ++++++ pr33763.diff ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -1,19 +1,17 @@ Index: gcc/tree-inline.c =================================================================== -*** gcc/tree-inline.c (revision 130489) ---- gcc/tree-inline.c (working copy) -*************** expand_call_inline (basic_block bb, tree -*** 2573,2578 **** ---- 2573,2584 ---- - if (!cgraph_inline_p (cg_edge, &reason)) - { - if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) -+ /* For extern inline functions that get redefined we always -+ silently ignored alway_inline flag. Better behaviour would -+ be to be able to keep both bodies and use extern inline body -+ for inlining, but we can't do that because frontends overwrite -+ the body. */ -+ && !cg_edge->callee->local.redefined_extern_inline - /* Avoid warnings during early inline pass. */ - && (!flag_unit_at_a_time || cgraph_global_info_ready)) - { +--- gcc/tree-inline.c.orig ++++ gcc/tree-inline.c +@@ -3238,6 +3238,12 @@ expand_call_inline (basic_block bb, gimp + goto egress; + + if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) ++ /* For extern inline functions that get redefined we always ++ silently ignored alway_inline flag. Better behaviour would ++ be to be able to keep both bodies and use extern inline body ++ for inlining, but we can't do that because frontends overwrite ++ the body. */ ++ && !cg_edge->callee->local.redefined_extern_inline + /* Avoid warnings during early inline pass. */ + && cgraph_global_info_ready) + { ++++++ program-transform-name.diff ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -1,344 +0,0 @@ -Index: gcc/ada/gcc-interface/Make-lang.in -=================================================================== -*** gcc/ada/gcc-interface/Make-lang.in.orig 2008-06-11 15:24:06.000000000 +0200 ---- gcc/ada/gcc-interface/Make-lang.in 2008-06-11 15:48:23.000000000 +0200 -*************** doc/gnat-style.pdf: ada/gnat-style.texi -*** 494,499 **** ---- 494,515 ---- - # likewise for gnatf, gnatchop, and gnatlink, gnatkr, gnatmake, gnat, - # gnatprep, gnatls, gnatxref, gnatfind, gnatname, gnatclean, - # gnatsym -+ GNATBIND_INSTALL_NAME := $(shell echo gnatbind|sed '$(program_transform_name)') -+ GNATCHOP_INSTALL_NAME := $(shell echo gnatchop|sed '$(program_transform_name)') -+ GNAT_INSTALL_NAME := $(shell echo gnat|sed '$(program_transform_name)') -+ GNATKR_INSTALL_NAME := $(shell echo gnatkr|sed '$(program_transform_name)') -+ GNATLINK_INSTALL_NAME := $(shell echo gnatlink|sed '$(program_transform_name)') -+ GNATLS_INSTALL_NAME := $(shell echo gnatls|sed '$(program_transform_name)') -+ GNATMAKE_INSTALL_NAME := $(shell echo gnatmake|sed '$(program_transform_name)') -+ GNATNAME_INSTALL_NAME := $(shell echo gnatname|sed '$(program_transform_name)') -+ GNATPREP_INSTALL_NAME := $(shell echo gnatprep|sed '$(program_transform_name)') -+ GNATXREF_INSTALL_NAME := $(shell echo gnatxref|sed '$(program_transform_name)') -+ GNATFIND_INSTALL_NAME := $(shell echo gnatfind|sed '$(program_transform_name)') -+ GNATCLEAN_INSTALL_NAME := $(shell echo gnatclean|sed '$(program_transform_name)') -+ GNATSYM_INSTALL_NAME := $(shell echo gnatsym|sed '$(program_transform_name)') -+ GNATLBR_INSTALL_NAME := $(shell echo gnatlbr|sed '$(program_transform_name)') -+ GNATDLL_INSTALL_NAME := $(shell echo gnatdll|sed '$(program_transform_name)') -+ VXADDR2LINE_INSTALL_NAME := $(shell echo vxaddr2line|sed '$(program_transform_name)') - ada.install-common: - $(MKDIR) $(DESTDIR)$(bindir) - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 507,514 **** - $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ -! $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 523,530 ---- - $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 522,529 **** - $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ - fi ; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ -! $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 538,545 ---- - $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ - fi ; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 537,544 **** - $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnat$(exeext); \ -! $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/gnat$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 553,560 ---- - $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 552,559 **** - $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ -! $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 568,575 ---- - $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 567,574 **** - $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ -! $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 583,590 ---- - $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 582,589 **** - $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatls$(exeext); \ -! $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/gnatls$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 598,605 ---- - $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 597,604 **** - $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ -! $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 613,620 ---- - $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 608,615 **** - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ - $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatname$(exeext); \ -! $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/gnatname$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 624,631 ---- - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ - $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 623,630 **** - $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ -! $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 639,646 ---- - $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 634,641 **** - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ - $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ -! $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 650,657 ---- - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ - $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 645,652 **** - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ - $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ -! $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 661,668 ---- - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ - $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 656,663 **** - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ - $(INSTALL_PROGRAM) gnatclean-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ -! $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ - fi ; \ - fi - # ---- 672,679 ---- - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ - $(INSTALL_PROGRAM) gnatclean-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - # -*************** ada.install-common: -*** 667,674 **** - then \ - if [ -f gnatsym$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ -! $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ - fi ; \ - fi - # ---- 683,690 ---- - then \ - if [ -f gnatsym$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATSYM_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/$(GNATSYM_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - # -*************** ada.install-common: -*** 678,685 **** - then \ - if [ -f gnatlbr$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ -! $(INSTALL_PROGRAM) gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ - fi ; \ - fi - # ---- 694,701 ---- - then \ - if [ -f gnatlbr$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATLBR_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatlbr$(exeext) $(DESTDIR)$(bindir)/$(GNATLBR_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - # -*************** ada.install-common: -*** 687,694 **** - # - -if [ -f gnat1$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ -! $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ - fi - # - # vxaddr2line is only used for cross ports (it calls the underlying cross ---- 703,710 ---- - # - -if [ -f gnat1$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ - fi - # - # vxaddr2line is only used for cross ports (it calls the underlying cross -*************** ada.install-common: -*** 698,705 **** - then \ - if [ -f vxaddr2line$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ -! $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ - fi ; \ - fi - ---- 714,721 ---- - then \ - if [ -f vxaddr2line$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -*************** ada.uninstall: -*** 765,772 **** - -$(RM) $(DESTDIR)$(tooldir)/bin/gnatxref$(exeext) - -$(RM) $(DESTDIR)$(tooldir)/bin/gnatclean$(exeext) - -$(RM) $(DESTDIR)$(tooldir)/bin/gnatsym$(exeext) -- # Gnatlbr and Gnatchop are only used on VMS -- -$(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext) - - # Clean hooks: - # A lot of the ancillary files are deleted by the main makefile. ---- 781,786 ---- ++++++ Wunprototyped-calls.diff ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -1,94 +1,72 @@ Index: gcc/c.opt =================================================================== -*** gcc/c.opt (revision 131759) ---- gcc/c.opt (working copy) -*************** Wunknown-pragmas -*** 457,462 **** ---- 457,466 ---- - C ObjC C++ ObjC++ Warning - Warn about unrecognized pragmas - -+ Wunprototyped-calls -+ C Var(warn_unprototyped_calls) Warning -+ Warn about calls to unprototyped functions with at least one argument -+ - Wunused-macros - C ObjC C++ ObjC++ Warning - Warn about macros defined in the main file that are not used +--- gcc/c.opt.orig ++++ gcc/c.opt +@@ -472,6 +472,10 @@ Wunknown-pragmas + C ObjC C++ ObjC++ Warning + Warn about unrecognized pragmas + ++Wunprototyped-calls ++C Var(warn_unprototyped_calls) Warning ++Warn about calls to unprototyped functions with at least one argument ++ + Wunused-macros + C ObjC C++ ObjC++ Warning + Warn about macros defined in the main file that are not used Index: gcc/testsuite/gcc.dg/cleanup-1.c =================================================================== -*** gcc/testsuite/gcc.dg/cleanup-1.c (revision 131821) ---- gcc/testsuite/gcc.dg/cleanup-1.c (working copy) -*************** -*** 6,12 **** - #define C(x) __attribute__((cleanup(x))) - - static int f1(void *x U) { return 0; } -! static void f2() { } - static void f3(void) { } - static void f4(void *x U) { } - static void f5(int *x U) { } ---- 6,12 ---- - #define C(x) __attribute__((cleanup(x))) - - static int f1(void *x U) { return 0; } -! static void f2() { } /* { dg-message "declared here" "" } */ - static void f3(void) { } - static void f4(void *x U) { } - static void f5(int *x U) { } -*************** static void f9(int x U) { } -*** 18,24 **** - void test(void) - { - int o1 C(f1); -! int o2 C(f2); - int o3 C(f3); /* { dg-error "too many arguments" } */ - int o4 C(f4); - int o5 C(f5); ---- 18,24 ---- - void test(void) - { - int o1 C(f1); -! int o2 C(f2); /* { dg-warning "without a real prototype" } */ - int o3 C(f3); /* { dg-error "too many arguments" } */ - int o4 C(f4); - int o5 C(f5); +--- gcc/testsuite/gcc.dg/cleanup-1.c.orig ++++ gcc/testsuite/gcc.dg/cleanup-1.c +@@ -6,7 +6,7 @@ + #define C(x) __attribute__((cleanup(x))) + + static int f1(void *x U) { return 0; } +-static void f2() { } ++static void f2() { } /* { dg-message "declared here" "" } */ + static void f3(void) { } + static void f4(void *x U) { } + static void f5(int *x U) { } +@@ -18,7 +18,7 @@ static void f9(int x U) { } /* { dg-mess + void test(void) + { + int o1 C(f1); +- int o2 C(f2); ++ int o2 C(f2); /* { dg-warning "without a real prototype" } */ + int o3 C(f3); /* { dg-error "too many arguments" } */ + int o4 C(f4); + int o5 C(f5); Index: gcc/c-typeck.c =================================================================== -*** gcc/c-typeck.c (revision 133807) ---- gcc/c-typeck.c (working copy) -*************** build_function_call (tree function, tree -*** 2444,2449 **** ---- 2444,2461 ---- - if (nargs < 0) - return error_mark_node; - -+ /* If we cannot check function arguments because a prototype is -+ missing for the callee, warn here. */ -+ if (warn_unprototyped_calls -+ && nargs > 0 && !TYPE_ARG_TYPES (fntype) -+ && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl) -+ && !DECL_ARGUMENTS (fundecl)) -+ { -+ warning (OPT_Wunprototyped_calls, -+ "call to function %qD without a real prototype", fundecl); -+ inform (DECL_SOURCE_LOCATION (fundecl), "%qD was declared here", fundecl); -+ } -+ - /* Check that the arguments to the function are valid. */ - - check_function_arguments (TYPE_ATTRIBUTES (fntype), nargs, argarray, +--- gcc/c-typeck.c.orig ++++ gcc/c-typeck.c +@@ -2477,6 +2477,18 @@ build_function_call (tree function, tree + && !check_builtin_function_arguments (fundecl, nargs, argarray)) + return error_mark_node; + ++ /* If we cannot check function arguments because a prototype is ++ missing for the callee, warn here. */ ++ if (warn_unprototyped_calls ++ && nargs > 0 && !TYPE_ARG_TYPES (fntype) ++ && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl) ++ && !DECL_ARGUMENTS (fundecl)) ++ { ++ warning (OPT_Wunprototyped_calls, ++ "call to function %qD without a real prototype", fundecl); ++ inform (DECL_SOURCE_LOCATION (fundecl), "%qD was declared here", fundecl); ++ } ++ + /* Check that the arguments to the function are valid. */ + check_function_arguments (TYPE_ATTRIBUTES (fntype), nargs, argarray, + TYPE_ARG_TYPES (fntype)); Index: gcc/c-opts.c =================================================================== -*** gcc/c-opts.c (revision 143863) ---- gcc/c-opts.c (working copy) -*************** c_common_handle_option (size_t scode, co -*** 409,414 **** ---- 409,415 ---- - can turn it off only if it's not explicit. */ - if (warn_main == -1) - warn_main = (value ? 2 : 0); -+ warn_unprototyped_calls = 1; - } - else - { +--- gcc/c-opts.c.orig ++++ gcc/c-opts.c +@@ -409,6 +409,7 @@ c_common_handle_option (size_t scode, co + can turn it off only if it's not explicit. */ + if (warn_main == -1) + warn_main = (value ? 2 : 0); ++ warn_unprototyped_calls = 1; + } + else + { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lua for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package lua for openSUSE:Factory checked in at Mon Nov 23 10:52:36 CET 2009. -------- --- lua/lua.changes 2009-09-16 23:25:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/lua/lua.changes 2009-11-03 20:20:19.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:09:29 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua.spec ++++++ --- /var/tmp/diff_new_pack.nCnX5y/_old 2009-11-23 10:50:37.000000000 +0100 +++ /var/tmp/diff_new_pack.nCnX5y/_new 2009-11-23 10:50:37.000000000 +0100 @@ -20,7 +20,7 @@ Name: lua Version: 5.1.4 -Release: 5 +Release: 6 %define major_version 5.1 License: MIT License (or similar) Group: System/Libraries ++++++ lua-5.1.4-shared.diff ++++++ --- /var/tmp/diff_new_pack.nCnX5y/_old 2009-11-23 10:50:37.000000000 +0100 +++ /var/tmp/diff_new_pack.nCnX5y/_new 2009-11-23 10:50:37.000000000 +0100 @@ -1,7 +1,9 @@ ---- etc/lua.pc.shared 2008-01-11 14:12:59.000000000 +0100 -+++ etc/lua.pc 2008-03-26 21:19:51.000000000 +0100 +Index: etc/lua.pc +=================================================================== +--- etc/lua.pc.orig ++++ etc/lua.pc @@ -8,7 +8,7 @@ V= 5.1 - R= 5.1.3 + R= 5.1.4 # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' -prefix= /usr/local @@ -9,8 +11,10 @@ INSTALL_BIN= ${prefix}/bin INSTALL_INC= ${prefix}/include INSTALL_LIB= ${prefix}/lib ---- src/luaconf.h.shared 2008-01-18 18:07:48.000000000 +0100 -+++ src/luaconf.h 2008-03-26 21:19:51.000000000 +0100 +Index: src/luaconf.h +=================================================================== +--- src/luaconf.h.orig ++++ src/luaconf.h @@ -184,7 +184,7 @@ #elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ @@ -20,8 +24,10 @@ #define LUAI_DATA LUAI_FUNC #else ---- src/Makefile.shared 2008-01-19 20:37:58.000000000 +0100 -+++ src/Makefile 2008-03-26 21:19:51.000000000 +0100 +Index: src/Makefile +=================================================================== +--- src/Makefile.orig ++++ src/Makefile @@ -23,6 +23,7 @@ MYLIBS= PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris @@ -62,9 +68,11 @@ clean: $(RM) $(ALL_T) $(ALL_O) ---- Makefile.shared 2008-01-17 18:53:37.000000000 +0100 -+++ ./Makefile 2008-03-26 21:19:51.000000000 +0100 -@@ -38,7 +38,7 @@ PLATS= aix ansi bsd freebsd generic linu +Index: Makefile +=================================================================== +--- Makefile.orig ++++ Makefile +@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linu # What to install. TO_BIN= lua luac TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp @@ -73,8 +81,8 @@ TO_MAN= lua.1 luac.1 # Lua version and release. -@@ -57,6 +57,7 @@ install: dummy - cd src && $(MKDIR) -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) +@@ -62,6 +62,7 @@ install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + ln -s liblua.so.$(V) $(INSTALL_LIB)/liblua.so ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tcl for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package tcl for openSUSE:Factory checked in at Mon Nov 23 10:50:23 CET 2009. -------- --- tcl/tcl.changes 2009-08-02 20:48:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/tcl/tcl.changes 2009-11-18 17:52:36.000000000 +0100 @@ -1,0 +2,38 @@ +Wed Nov 18 16:18:20 CET 2009 - max(a)suse.de + +- Bugfix release 8.5.8. + * [info frame] account for continuation lines + * account for ia64_32 => platform 1.0.5 + * improved error message in tcltest => tcltest 2.3.2 + * Broken DST applied EU rules to US zones + * [sf#2446662] uniformly declare EOF on RST on sockets + * [sf#1028264] delay WSACleanup() from under our feet + * [sf#2785893] find command in deleted namespace + * [sf#2798543] incorrect [expr] integer ** results + * [sf#2801413] overflow in [format] + * [sf#2802881] corrected compile env context + * [sf#2819200] underflow settings on MIPS systems + * [sf#2820349] plug event leak in notifier + * [sf#2826248] crash in Tcl_GetChannelHandle + * [sf#2830354] overflow in [format] + * [sf#2827000] reflected channels can signal EGAIN + * [sf#2806250] EIAS violation in ~foo pathnames + * [sf#2837800] [glob */foo] return ./~x/foo + * [sf#2845535] overflows in [format] + * [sf#2849860] http handle "quoted" charset value + * [sf#1941434] broken tclTomMath.h includes + * [sf#2871908] leaked hash table + * [sf#2874678] bignum leak in [dict incr] + * [sf#2629338] crash in var unset traces + * [sf#2107634] extend [read] and [gets] to Tcl string limits + * [sf#2882561] Haiku OS signal support + * [sf#2800740] halved bignum memory on 64-bit systems + POTENTIAL INCOMPATIBILITY + * [sf#2854929] TM search path support in Safe Base + * [sf#2888099] [close] loses ENOSPC error + * [sf#2891171] RFC 3986 compliance for ? in URL => http 2.7.5 + * [sf#2895565] [fcopy -size] miscounts when converting encodings + +- Added tcl-unload.patch to fix a crash in the browser plugin. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- tcl8.5.7-src.tar.bz2 New: ---- tcl8.5.8-src.tar.bz2 tcl-unload.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcl.spec ++++++ --- /var/tmp/diff_new_pack.1GJ3GU/_old 2009-11-23 10:48:40.000000000 +0100 +++ /var/tmp/diff_new_pack.1GJ3GU/_new 2009-11-23 10:48:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package tcl (Version 8.5.7) +# spec file for package tcl (Version 8.5.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: tcl Url: http://www.tcl.tk -Version: 8.5.7 -Release: 3 +Version: 8.5.8 +Release: 1 %define TCL_MINOR %(echo %version | cut -c1-3) BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: The Tcl Programming Language @@ -40,6 +40,7 @@ Source2: baselibs.conf Source3: macros.tcl Patch0: tcl.patch +Patch1: tcl-unload.patch %description Tcl (Tool Command Language) is a very powerful but easy to learn @@ -86,11 +87,11 @@ %prep %setup -q -n %name%version %patch0 +%patch1 %build cd unix %configure \ - --enable-treads \ --enable-man-symlinks \ --enable-man-compression=gzip %define scriptdir %_libdir/tcl ++++++ tcl8.5.7-src.tar.bz2 -> tcl8.5.8-src.tar.bz2 ++++++ ++++ 13785 lines of diff (skipped) ++++++ tcl-unload.patch ++++++ Index: generic/tclLoad.c =================================================================== --- generic/tclLoad.c.orig +++ generic/tclLoad.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclLoad.c,v 1.16.4.2 2008/11/14 00:22:39 nijtmans Exp $ + * RCS: @(#) $Id: tclLoad.c,v 1.16 2007/02/20 23:24:03 nijtmans Exp $ */ #include "tclInt.h" @@ -795,9 +795,7 @@ Tcl_UnloadObjCmd( if (unLoadProcPtr != NULL) { Tcl_MutexLock(&packageMutex); - if ((pkgPtr->unloadProc != NULL) || (unLoadProcPtr == TclFSUnloadTempFile)) { - (*unLoadProcPtr)(pkgPtr->loadHandle); - } + (*unLoadProcPtr)(pkgPtr->loadHandle); /* * Remove this library from the loaded library cache. @@ -1154,9 +1152,7 @@ TclFinalizeLoad(void) if (pkgPtr->fileName[0] != '\0') { Tcl_FSUnloadFileProc *unLoadProcPtr = pkgPtr->unLoadProcPtr; - if ((unLoadProcPtr != NULL) - && ((pkgPtr->unloadProc != NULL) - || (unLoadProcPtr == TclFSUnloadTempFile))) { + if (unLoadProcPtr != NULL) { (*unLoadProcPtr)(pkgPtr->loadHandle); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 trustedgrub for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package trustedgrub for openSUSE:Factory checked in at Fri Nov 20 15:33:36 CET 2009. -------- --- trustedgrub/trustedgrub.changes 2009-07-29 14:19:24.000000000 +0200 +++ trustedgrub/trustedgrub.changes 2009-11-15 17:00:22.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 15 17:00:06 CET 2009 - meissner(a)suse.de + +- refreshed all patches to fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trustedgrub.spec ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -26,7 +26,7 @@ License: GPL v2 or later Group: System/Boot Version: 1.1.3 -Release: 9 +Release: 10 Source0: TrustedGRUB-%{version}.tgz Source2: grubonce Source3: grub-install ++++++ bad-assert-sideeffect ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.95/lib/device.c.orig 2004-05-23 18:34:29.000000000 +0200 -+++ grub-0.95/lib/device.c 2004-09-21 18:15:23.785137837 +0200 -@@ -828,9 +828,11 @@ int +Index: TrustedGRUB-1.1.3/lib/device.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/lib/device.c ++++ TrustedGRUB-1.1.3/lib/device.c +@@ -835,9 +835,11 @@ int is_disk_device (char **map, int drive) { struct stat st; ++++++ chainloader-devicefix ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.97/stage2/builtins.c.orig 2005-02-15 22:58:23.000000000 +0100 -+++ grub-0.97/stage2/builtins.c 2006-04-19 16:26:33.000000000 +0200 -@@ -455,6 +455,10 @@ chainloader_func (char *arg, int flags) +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -463,6 +463,10 @@ if (perform_sha1) *((unsigned long *) (BOOTSEC_LOCATION + BOOTSEC_BPB_HIDDEN_SECTORS)) = part_start; ++++++ ext2-support-256byte-inodes ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,5 +1,7 @@ ---- grub-0.97.orig/stage2/fsys_ext2fs.c 2008-04-14 11:57:47.000000000 +0200 -+++ grub-0.97/stage2/fsys_ext2fs.c 2008-04-15 12:40:14.000000000 +0200 +Index: TrustedGRUB-1.1.3/stage2/fsys_ext2fs.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/fsys_ext2fs.c ++++ TrustedGRUB-1.1.3/stage2/fsys_ext2fs.c @@ -79,7 +79,50 @@ struct ext2_super_block __u32 s_rev_level; /* Revision level */ __u16 s_def_resuid; /* Default uid for reserved blocks */ @@ -52,9 +54,9 @@ }; struct ext2_group_desc -@@ -218,6 +260,9 @@ struct ext2_dir_entry +@@ -218,6 +261,9 @@ struct ext2_dir_entry #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) - #define EXT2_ADDR_PER_BLOCK_BITS(s) (grub_log2(EXT2_ADDR_PER_BLOCK(s))) + #define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s))) +#define EXT2_INODE_SIZE(s) (SUPERBLOCK->s_inode_size) +#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) @@ -62,7 +64,7 @@ /* linux/ext2_fs.h */ #define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) /* kind of from ext2/super.c */ -@@ -555,7 +600,7 @@ ext2fs_dir (char *dirname) +@@ -555,7 +601,7 @@ ext2fs_dir (char *dirname) gdp = GROUP_DESC; ino_blk = gdp[desc].bg_inode_table + (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group)) @@ -71,7 +73,7 @@ #ifdef E2DEBUG printf ("inode table fsblock=%d\n", ino_blk); #endif /* E2DEBUG */ -@@ -567,13 +612,13 @@ ext2fs_dir (char *dirname) +@@ -567,13 +613,13 @@ ext2fs_dir (char *dirname) /* reset indirect blocks! */ mapblock2 = mapblock1 = -1; ++++++ grub-1.1.3-devicemap.diff ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,7 @@ -diff -Burbp grub-0.93.orig/grub/main.c grub-0.93/grub/main.c ---- grub-0.93.orig/grub/main.c 2003-06-10 18:29:37.000000000 +0200 -+++ grub-0.93/grub/main.c 2003-06-10 18:30:36.000000000 +0200 +Index: TrustedGRUB-1.1.3/grub/main.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/grub/main.c ++++ TrustedGRUB-1.1.3/grub/main.c @@ -44,7 +44,7 @@ int use_curses = 0; int verbose = 0; int read_only = 0; @@ -10,10 +11,11 @@ static int default_boot_drive; static int default_install_partition; static char *default_config_file; -diff -Burbp grub-0.93.orig/lib/device.c grub-0.93/lib/device.c ---- grub-0.93.orig/lib/device.c 2003-06-10 18:29:37.000000000 +0200 -+++ grub-0.93/lib/device.c 2003-06-10 18:30:36.000000000 +0200 -@@ -382,6 +382,7 @@ read_device_map (FILE *fp, char **map, c +Index: TrustedGRUB-1.1.3/lib/device.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/lib/device.c ++++ TrustedGRUB-1.1.3/lib/device.c +@@ -519,6 +519,7 @@ read_device_map (FILE *fp, char **map, c probing devices. */ char buf[1024]; /* XXX */ int line_number = 0; @@ -21,7 +23,7 @@ while (fgets (buf, sizeof (buf), fp)) { -@@ -408,14 +409,14 @@ read_device_map (FILE *fp, char **map, c +@@ -545,14 +546,14 @@ read_device_map (FILE *fp, char **map, c if (*ptr != '(') { show_error (line_number, "No open parenthesis found"); @@ -38,16 +40,16 @@ } if (*ptr == 'f') -@@ -426,7 +427,7 @@ read_device_map (FILE *fp, char **map, c - if (drive < 0 || drive > 8) +@@ -563,7 +564,7 @@ read_device_map (FILE *fp, char **map, c + if (drive < 0) { show_error (line_number, "Bad device number"); - return 0; + continue; } - - if (! is_floppy) -@@ -435,7 +436,7 @@ read_device_map (FILE *fp, char **map, c + else if (drive > 127) + { +@@ -579,7 +580,7 @@ read_device_map (FILE *fp, char **map, c if (*ptr != ')') { show_error (line_number, "No close parenthesis found"); @@ -56,7 +58,7 @@ } ptr++; -@@ -446,7 +447,7 @@ read_device_map (FILE *fp, char **map, c +@@ -590,7 +591,7 @@ read_device_map (FILE *fp, char **map, c if (! *ptr) { show_error (line_number, "No filename found"); @@ -65,7 +67,7 @@ } /* Terminate the filename. */ -@@ -464,9 +465,11 @@ read_device_map (FILE *fp, char **map, c +@@ -608,9 +609,11 @@ read_device_map (FILE *fp, char **map, c map[drive] = strdup (ptr); assert (map[drive]); @@ -78,7 +80,7 @@ } /* Initialize the device map MAP. *MAP will be allocated from the heap -@@ -671,7 +674,7 @@ write_to_partition (char **map, int driv +@@ -849,7 +852,7 @@ write_to_partition (char **map, int driv int sector, int size, const char *buf) { char dev[PATH_MAX]; /* XXX */ @@ -87,7 +89,7 @@ if ((partition & 0x00FF00) != 0x00FF00) { -@@ -689,7 +692,16 @@ write_to_partition (char **map, int driv +@@ -867,7 +870,16 @@ write_to_partition (char **map, int driv if (strcmp (dev + strlen(dev) - 5, "/disc") == 0) strcpy (dev + strlen(dev) - 5, "/part"); } @@ -105,9 +107,11 @@ /* Open the partition. */ fd = open (dev, O_RDWR); ---- grub-0.94/util/grub-md5-crypt.in.orig 2003-07-09 04:45:51.000000000 -0700 -+++ grub-0.94/util/grub-md5-crypt.in 2004-05-11 09:26:31.943224317 -0700 -@@ -88,7 +88,7 @@ +Index: TrustedGRUB-1.1.3/util/grub-md5-crypt.in +=================================================================== +--- TrustedGRUB-1.1.3.orig/util/grub-md5-crypt.in ++++ TrustedGRUB-1.1.3/util/grub-md5-crypt.in +@@ -88,7 +88,7 @@ if test "x$password" != "x$password2"; t fi # Run the grub shell. ++++++ grub-1.1.3-initrdaddr.diff ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.96/stage2/boot.c -+++ grub-0.96/stage2/boot.c -@@ -824,8 +824,11 @@ +Index: TrustedGRUB-1.1.3/stage2/boot.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/boot.c ++++ TrustedGRUB-1.1.3/stage2/boot.c +@@ -1275,8 +1275,11 @@ load_initrd (char *initrd) moveto = (mbi.mem_upper + 0x400) << 10; moveto = (moveto - len) & 0xfffff000; ++++++ grub-R ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.96/stage2/builtins.c.orig 2004-06-20 15:33:04.000000000 +0200 -+++ grub-0.96/stage2/builtins.c 2005-09-02 14:38:53.000000000 +0200 -@@ -762,11 +762,11 @@ +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -787,11 +787,11 @@ static int default_func (char *arg, int flags) { #ifndef SUPPORT_DISKLESS @@ -15,7 +17,7 @@ #endif /* SUPPORT_DISKLESS */ if (! safe_parse_maxint (&arg, &default_entry)) -@@ -787,6 +787,22 @@ +@@ -812,6 +812,22 @@ static struct builtin builtin_default = #endif }; @@ -38,9 +40,11 @@ #ifdef GRUB_UTIL /* device */ ---- grub-0.96/stage2/stage2.c~ 2004-07-24 20:53:47.000000000 +0200 -+++ grub-0.96/stage2/stage2.c 2005-09-02 14:45:04.000000000 +0200 -@@ -827,6 +827,7 @@ +Index: TrustedGRUB-1.1.3/stage2/stage2.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/stage2.c ++++ TrustedGRUB-1.1.3/stage2/stage2.c +@@ -1217,6 +1217,7 @@ get_line_from_config (char *cmdline, int return pos; } @@ -48,7 +52,7 @@ /* This is the starting function in C. */ void -@@ -1048,7 +1049,9 @@ +@@ -1490,7 +1491,9 @@ cmain (void) } while (is_preset); } ++++++ grub-a20.patch ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.97/stage2/asm.S.orig 2007-08-24 13:03:39.000000000 +0200 -+++ grub-0.97/stage2/asm.S 2007-08-24 13:08:37.000000000 +0200 -@@ -1620,42 +1620,83 @@ ENTRY(set_vbe_mode) +Index: TrustedGRUB-1.1.3/stage2/asm.S +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/asm.S ++++ TrustedGRUB-1.1.3/stage2/asm.S +@@ -1805,42 +1805,83 @@ nopm: DATA32 call EXT_C(real_to_prot) * * Gate address-line 20 for high memory. * @@ -105,7 +107,7 @@ pushl %eax call gloop1 -@@ -1669,11 +1710,7 @@ gloopint1: +@@ -1854,11 +1895,7 @@ gloopint1: jnz gloopint1 movb $KB_OUTPUT_MASK, %al ++++++ grub-grubonce-no-wait ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -2,9 +2,11 @@ stage2/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/stage2/builtins.c -+++ b/stage2/builtins.c -@@ -4259,7 +4259,7 @@ terminal_func (char *arg, int flags) +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -4369,7 +4369,7 @@ terminal_func (char *arg, int flags) /* If multiple terminals are specified, wait until the user pushes any key on one of the terminals. */ ++++++ grub-long-commandline ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -12,9 +12,11 @@ stage2/shared.h | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) ---- a/stage2/boot.c -+++ b/stage2/boot.c -@@ -241,7 +241,7 @@ load_image (char *kernel, char *arg, ker +Index: TrustedGRUB-1.1.3/stage2/boot.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/boot.c ++++ TrustedGRUB-1.1.3/stage2/boot.c +@@ -512,7 +512,7 @@ load_image (char *kernel, char *arg, ker } if (lh->version >= 0x0202) @@ -23,7 +25,7 @@ else { lh->cl_magic = LINUX_CL_MAGIC; -@@ -407,6 +407,15 @@ load_image (char *kernel, char *arg, ker +@@ -682,6 +682,15 @@ load_image (char *kernel, char *arg, ker while (dest < linux_data_tmp_addr + LINUX_CL_END_OFFSET && *src) *(dest++) = *(src++); @@ -39,9 +41,11 @@ /* Old Linux kernels have problems determining the amount of the available memory. To work around this problem, we add the "mem" option to the kernel command line. This has its ---- a/stage2/shared.h -+++ b/stage2/shared.h -@@ -161,7 +161,9 @@ extern char *grub_scratch_mem; +Index: TrustedGRUB-1.1.3/stage2/shared.h +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/shared.h ++++ TrustedGRUB-1.1.3/stage2/shared.h +@@ -176,7 +176,9 @@ extern char *grub_scratch_mem; #define LINUX_CL_OFFSET 0x9000 #define LINUX_CL_END_OFFSET 0x90FF ++++++ grub-read-gpt ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,7 +1,8 @@ -diff -Nurp grub-0.97.old/stage2/builtins.c grub-0.97/stage2/builtins.c ---- grub-0.97.old/stage2/builtins.c 2008-11-05 17:39:17.000000000 +0100 -+++ grub-0.97/stage2/builtins.c 2008-11-05 17:40:36.000000000 +0100 -@@ -1255,14 +1255,15 @@ find_func (char *arg, int flags) +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -1274,14 +1274,15 @@ find_func (char *arg, int flags) for (drive = 0x80; drive < 0x88; drive++) { unsigned long part = 0xFFFFFF; @@ -20,7 +21,7 @@ { if (type != PC_SLICE_TYPE_NONE && ! IS_PC_SLICE_TYPE_BSD (type) -@@ -2877,8 +2878,8 @@ parttype_func (char *arg, int flags) +@@ -2969,8 +2970,8 @@ parttype_func (char *arg, int flags) { int new_type; unsigned long part = 0xFFFFFF; @@ -31,7 +32,7 @@ char mbr[512]; /* Get the drive and the partition. */ -@@ -2915,8 +2916,15 @@ parttype_func (char *arg, int flags) +@@ -3007,8 +3008,15 @@ parttype_func (char *arg, int flags) /* Look for the partition. */ while (next_partition (current_drive, 0xFFFFFF, &part, &type, &start, &len, &offset, &entry, @@ -48,18 +49,19 @@ if (part == current_partition) { /* Found. */ -diff -Nurp grub-0.97.old/stage2/disk_io.c grub-0.97/stage2/disk_io.c ---- grub-0.97.old/stage2/disk_io.c 2008-11-05 17:39:17.000000000 +0100 -+++ grub-0.97/stage2/disk_io.c 2008-11-05 17:40:36.000000000 +0100 -@@ -21,6 +21,7 @@ +Index: TrustedGRUB-1.1.3/stage2/disk_io.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/disk_io.c ++++ TrustedGRUB-1.1.3/stage2/disk_io.c +@@ -20,6 +20,7 @@ #include <shared.h> #include <filesys.h> +#include <gpt.h> #ifdef SUPPORT_NETBOOT # define GRUB 1 - -@@ -502,8 +503,8 @@ int + # include <etherboot.h> +@@ -520,8 +521,8 @@ int set_partition_hidden_flag (int hidden) { unsigned long part = 0xFFFFFF; @@ -70,7 +72,7 @@ char mbr[512]; /* The drive must be a hard disk. */ -@@ -524,8 +525,15 @@ set_partition_hidden_flag (int hidden) +@@ -542,8 +543,15 @@ set_partition_hidden_flag (int hidden) /* Look for the partition. */ while (next_partition (current_drive, 0xFFFFFF, &part, &type, &start, &len, &offset, &entry, @@ -87,7 +89,7 @@ if (part == current_partition) { /* Found. */ -@@ -577,11 +585,14 @@ next_partition (unsigned long drive, uns +@@ -598,11 +606,14 @@ next_partition (unsigned long drive, uns unsigned long *partition, int *type, unsigned long *start, unsigned long *len, unsigned long *offset, int *entry, @@ -103,7 +105,7 @@ /* Get next BSD partition in current PC slice. */ int next_bsd_partition (void) -@@ -666,6 +677,40 @@ next_partition (unsigned long drive, uns +@@ -687,6 +698,40 @@ next_partition (unsigned long drive, uns return 0; } @@ -144,7 +146,7 @@ /* Increase the entry number. */ (*entry)++; -@@ -710,6 +755,43 @@ next_partition (unsigned long drive, uns +@@ -731,6 +776,43 @@ next_partition (unsigned long drive, uns return 1; } @@ -188,7 +190,7 @@ /* Start the body of this function. */ #ifndef STAGE1_5 -@@ -717,6 +799,9 @@ next_partition (unsigned long drive, uns +@@ -738,6 +820,9 @@ next_partition (unsigned long drive, uns return 0; #endif @@ -198,7 +200,7 @@ /* If previous partition is a BSD partition or a PC slice which contains BSD partitions... */ if ((*partition != 0xFFFFFF && IS_PC_SLICE_TYPE_BSD (*type & 0xff)) -@@ -755,6 +840,9 @@ real_open_partition (int flags) +@@ -776,6 +861,9 @@ real_open_partition (int flags) unsigned long dest_partition = current_partition; unsigned long part_offset; unsigned long ext_offset; @@ -208,7 +210,7 @@ int entry; char buf[SECTOR_SIZE]; int bsd_part, pc_slice; -@@ -766,7 +854,8 @@ real_open_partition (int flags) +@@ -787,7 +875,8 @@ real_open_partition (int flags) int ret = next_partition (current_drive, dest_partition, &current_partition, &current_slice, &part_start, &part_length, @@ -218,9 +220,10 @@ bsd_part = (current_partition >> 8) & 0xFF; pc_slice = current_partition >> 16; return ret; -diff -Nurp grub-0.97.old/stage2/gpt.h grub-0.97/stage2/gpt.h ---- grub-0.97.old/stage2/gpt.h 1970-01-01 01:00:00.000000000 +0100 -+++ grub-0.97/stage2/gpt.h 2008-11-05 17:40:36.000000000 +0100 +Index: TrustedGRUB-1.1.3/stage2/gpt.h +=================================================================== +--- /dev/null ++++ TrustedGRUB-1.1.3/stage2/gpt.h @@ -0,0 +1,68 @@ +/* + * GRUB -- GRand Unified Bootloader @@ -290,9 +293,10 @@ + ((((entry) * (size) + 1) & (SECTOR_SIZE - 1)) - 1) + +#endif /* _GPT_H */ -diff -Nurp grub-0.97.old/stage2/pc_slice.h grub-0.97/stage2/pc_slice.h ---- grub-0.97.old/stage2/pc_slice.h 2008-11-05 17:39:17.000000000 +0100 -+++ grub-0.97/stage2/pc_slice.h 2008-11-05 17:40:36.000000000 +0100 +Index: TrustedGRUB-1.1.3/stage2/pc_slice.h +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/pc_slice.h ++++ TrustedGRUB-1.1.3/stage2/pc_slice.h @@ -117,6 +117,7 @@ #define PC_SLICE_TYPE_ZEN 0xbc #define PC_SLICE_TYPE_ZEN_DISABLED 0xbd @@ -301,10 +305,11 @@ #define PC_SLICE_TYPE_LINUX_RAID 0xfd -diff -Nurp grub-0.97.old/stage2/shared.h grub-0.97/stage2/shared.h ---- grub-0.97.old/stage2/shared.h 2008-11-05 17:39:17.000000000 +0100 -+++ grub-0.97/stage2/shared.h 2008-11-05 17:40:36.000000000 +0100 -@@ -984,7 +984,9 @@ int next_partition (unsigned long drive, +Index: TrustedGRUB-1.1.3/stage2/shared.h +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/shared.h ++++ TrustedGRUB-1.1.3/stage2/shared.h +@@ -1034,7 +1034,9 @@ int next_partition (unsigned long drive, unsigned long *partition, int *type, unsigned long *start, unsigned long *len, unsigned long *offset, int *entry, ++++++ reiser-unpack ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.95/stage2/filesys.h.orig 2004-05-14 21:36:43.000000000 +0200 -+++ grub-0.95/stage2/filesys.h 2004-09-30 17:16:20.741176364 +0200 -@@ -73,6 +73,16 @@ +Index: TrustedGRUB-1.1.3/stage2/filesys.h +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/filesys.h ++++ TrustedGRUB-1.1.3/stage2/filesys.h +@@ -82,6 +82,16 @@ int reiserfs_mount (void); int reiserfs_read (char *buf, int len); int reiserfs_dir (char *dirname); int reiserfs_embed (int *start_sector, int needed_sectors); @@ -17,9 +19,11 @@ #else #define FSYS_REISERFS_NUM 0 #endif ---- grub-0.95/stage2/builtins.c.orig 2004-05-14 21:30:52.000000000 +0200 -+++ grub-0.95/stage2/builtins.c 2004-09-30 17:18:52.342818812 +0200 -@@ -1807,9 +1807,23 @@ +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -1879,9 +1879,23 @@ install_func (char *arg, int flags) #ifdef GRUB_UTIL else if (grub_memcmp ("--stage2=", arg, sizeof ("--stage2=") - 1) == 0) { ++++++ remove-buildid.diff ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,4 +1,6 @@ ---- stage1/Makefile.am +Index: stage1/Makefile.am +=================================================================== +--- stage1/Makefile.am.orig +++ stage1/Makefile.am @@ -12,4 +12,4 @@ stage1_exec_SOURCES = stage1.S stage1.h @@ -6,9 +8,11 @@ .exec: - $(OBJCOPY) -O binary $< $@ + $(OBJCOPY) -R .note.gnu.build-id -O binary $< $@ ---- stage2/Makefile.am +Index: stage2/Makefile.am +=================================================================== +--- stage2/Makefile.am.orig +++ stage2/Makefile.am -@@ -269,4 +269,4 @@ pxegrub: pxeloader diskless +@@ -283,4 +283,4 @@ pxegrub: pxeloader diskless # General rule for making a raw binary. SUFFIXES = .exec .exec: ++++++ string-ops-fix ++++++ --- /var/tmp/diff_new_pack.XfG6cc/_old 2009-11-20 15:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.XfG6cc/_new 2009-11-20 15:33:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- grub-0.97/stage2/builtins.c.orig 2008-11-20 17:46:28.000000000 +0100 -+++ grub-0.97/stage2/builtins.c 2008-11-20 17:48:58.000000000 +0100 -@@ -3862,7 +3862,8 @@ setup_func (char *arg, int flags) +Index: TrustedGRUB-1.1.3/stage2/builtins.c +=================================================================== +--- TrustedGRUB-1.1.3.orig/stage2/builtins.c ++++ TrustedGRUB-1.1.3/stage2/builtins.c +@@ -3971,7 +3971,8 @@ setup_func (char *arg, int flags) char config_filename[64]; char real_config_filename[64]; char cmd_arg[256]; @@ -10,7 +12,7 @@ char *buffer = (char *) RAW_ADDR (0x100000); int is_force_lba = 0; char *stage2_arg = 0; -@@ -3900,15 +3901,15 @@ setup_func (char *arg, int flags) +@@ -4009,15 +4010,15 @@ setup_func (char *arg, int flags) { char tmp[16]; grub_sprintf (tmp, ",%d", (partition >> 16) & 0xFF); @@ -29,7 +31,7 @@ } int embed_stage1_5 (char *stage1_5, int drive, int partition) -@@ -4125,6 +4126,7 @@ setup_func (char *arg, int flags) +@@ -4228,6 +4229,7 @@ setup_func (char *arg, int flags) config_filename, real_config_filename); #endif /* NOT USED */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 at for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package at for openSUSE:Factory checked in at Fri Nov 20 14:38:36 CET 2009. -------- --- at/at.changes 2009-11-03 20:15:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/at/at.changes 2009-11-20 09:46:28.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 18 17:18:44 UTC 2009 - mseben(a)novell.com + +- added pam conversion function (reworked pam.patch) fate#306386 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at.spec ++++++ --- /var/tmp/diff_new_pack.qqLFXt/_old 2009-11-20 14:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.qqLFXt/_new 2009-11-20 14:37:56.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Daemons AutoReqProv: on Version: 3.1.8 -Release: 1076 +Release: 1077 Summary: A Job Manager Source: at_3.1.8-11.tar.gz Source1: atd.init ++++++ at-3.1.8-pam.patch ++++++ --- /var/tmp/diff_new_pack.qqLFXt/_old 2009-11-20 14:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.qqLFXt/_new 2009-11-20 14:37:56.000000000 +0100 @@ -1,6 +1,8 @@ ---- Makefile.in +Index: Makefile.in +=================================================================== +--- Makefile.in.orig +++ Makefile.in -@@ -28,6 +28,7 @@ +@@ -28,6 +28,7 @@ YACC = @YACC@ LEX = @LEX@ LEXLIB = @LEXLIB@ SELINUXLIB = @SELINUXLIB@ @@ -8,7 +10,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ -@@ -73,7 +74,7 @@ +@@ -73,7 +74,7 @@ at: $(ATOBJECTS) $(LN_S) -f at atrm atd: $(RUNOBJECTS) @@ -17,18 +19,17 @@ y.tab.c y.tab.h: parsetime.y $(YACC) -d parsetime.y ---- atd.c +Index: atd.c +=================================================================== +--- atd.c.orig +++ atd.c -@@ -93,6 +93,20 @@ +@@ -93,6 +93,17 @@ int selinux_enabled=0; #include <selinux/av_permissions.h> #endif +#ifdef WITH_PAM +#include <security/pam_appl.h> +static pam_handle_t *pamh = NULL; -+static const struct pam_conv conv = { -+ NULL -+}; +#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ + fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \ + syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \ @@ -40,7 +41,7 @@ /* Local headers */ #include "privs.h" -@@ -102,6 +116,10 @@ +@@ -102,6 +113,10 @@ int selinux_enabled=0; #include "getloadavg.h" #endif @@ -51,7 +52,7 @@ /* Macros */ #define BATCH_INTERVAL_DEFAULT 60 -@@ -195,6 +213,19 @@ +@@ -195,6 +210,47 @@ myfork() #define fork myfork #endif @@ -68,10 +69,38 @@ +#define ATD_MAIL_NAME "mailx" +#endif + ++#ifdef WITH_PAM ++static int ++cron_conv(int num_msg, const struct pam_message **msgm, ++ struct pam_response **response, void *appdata_ptr) ++{ ++ struct pam_message**m = msgm; ++ int i; ++ ++ for (i = 0; i < num_msg; i++) { ++ switch (m[i]->msg_style) { ++ case PAM_ERROR_MSG: ++ case PAM_TEXT_INFO: ++ if (m[i]->msg != NULL) { ++ syslog (LOG_NOTICE, "%s", m[i]->msg); ++ } ++ break; ++ default: ++ break; ++ } ++ } ++ return (0); ++} ++ ++static const struct pam_conv conv = { ++ cron_conv, NULL ++}; ++#endif ++ static void run_file(const char *filename, uid_t uid, gid_t gid) { -@@ -217,6 +248,9 @@ +@@ -217,6 +273,9 @@ run_file(const char *filename, uid_t uid int ngid; char queue; unsigned long jobno; @@ -81,7 +110,7 @@ sscanf(filename, "%c%5lx", &queue, &jobno); -@@ -361,6 +395,23 @@ +@@ -361,6 +420,23 @@ run_file(const char *filename, uid_t uid fstat(fd_out, &buf); size = buf.st_size; @@ -105,7 +134,7 @@ close(STDIN_FILENO); close(STDOUT_FILENO); close(STDERR_FILENO); -@@ -372,6 +423,16 @@ +@@ -372,6 +448,16 @@ run_file(const char *filename, uid_t uid else if (pid == 0) { char *nul = NULL; char **nenvp = &nul; @@ -122,7 +151,7 @@ /* Set up things for the child; we want standard input from the * input file, and standard output and error sent to our output file. -@@ -394,8 +455,6 @@ +@@ -394,8 +480,6 @@ run_file(const char *filename, uid_t uid if (chdir(ATJOB_DIR) < 0) perr("Cannot chdir to " ATJOB_DIR); @@ -131,7 +160,7 @@ nice((tolower((int) queue) - 'a' + 1) * 2); if (initgroups(pentry->pw_name, pentry->pw_gid)) -@@ -485,6 +544,24 @@ +@@ -485,6 +569,24 @@ run_file(const char *filename, uid_t uid if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0) perr("Exec failed for /bin/sh"); @@ -156,7 +185,7 @@ PRIV_END } /* We're the parent. Let's wait. -@@ -498,13 +575,6 @@ +@@ -498,13 +600,6 @@ run_file(const char *filename, uid_t uid */ waitpid(pid, (int *) NULL, 0); @@ -170,7 +199,7 @@ /* Send mail. Unlink the output file after opening it, so it * doesn't hang around after the run. */ -@@ -514,6 +584,14 @@ +@@ -514,6 +609,14 @@ run_file(const char *filename, uid_t uid unlink(filename); @@ -185,7 +214,7 @@ /* The job is now finished. We can delete its input file. */ chdir(ATJOB_DIR); -@@ -522,7 +600,31 @@ +@@ -522,7 +625,31 @@ run_file(const char *filename, uid_t uid if (((send_mail != -1) && (buf.st_size != size)) || (send_mail == 1)) { @@ -217,7 +246,7 @@ if (initgroups(pentry->pw_name, pentry->pw_gid)) perr("Cannot delete saved userids"); -@@ -535,6 +637,47 @@ +@@ -535,6 +662,47 @@ run_file(const char *filename, uid_t uid chdir ("/"); @@ -265,7 +294,7 @@ #if defined(SENDMAIL) execl(SENDMAIL, "sendmail", mailname, (char *) NULL); #elif defined(MAILC) -@@ -546,7 +689,33 @@ +@@ -546,7 +714,33 @@ run_file(const char *filename, uid_t uid #endif perr("Exec failed for mail command"); @@ -300,7 +329,7 @@ } exit(EXIT_SUCCESS); } -@@ -741,7 +910,7 @@ +@@ -741,7 +935,7 @@ main(int argc, char *argv[]) #ifdef WITH_SELINUX selinux_enabled=is_selinux_enabled(); @@ -309,7 +338,7 @@ /* We don't need root privileges all the time; running under uid and gid * daemon is fine. */ -@@ -758,12 +927,7 @@ +@@ -758,12 +952,7 @@ main(int argc, char *argv[]) RELINQUISH_PRIVS_ROOT(daemon_uid, daemon_gid) @@ -323,7 +352,9 @@ opterr = 0; errno = 0; run_as_daemon = 1; ---- config.h.in +Index: config.h.in +=================================================================== +--- config.h.in.orig +++ config.h.in @@ -187,3 +187,7 @@ @@ -333,9 +364,11 @@ +/* Define if you are building with_pam */ +#undef WITH_PAM + ---- configure.in +Index: configure.in +=================================================================== +--- configure.in.orig +++ configure.in -@@ -323,4 +323,11 @@ +@@ -323,4 +323,11 @@ AC_CHECK_LIB(selinux, is_selinux_enabled AC_SUBST(SELINUXLIB) AC_SUBST(WITH_SELINUX) @@ -347,9 +380,11 @@ +AC_SUBST(PAMLIB) + AC_OUTPUT(Makefile atrun atd.8 atrun.8 at.1 batch) ---- perm.c +Index: perm.c +=================================================================== +--- perm.c.orig +++ perm.c -@@ -109,14 +109,15 @@ +@@ -109,14 +109,15 @@ user_in_file(const char *path, const cha int check_permission() { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ipsec-tools for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package ipsec-tools for openSUSE:Factory checked in at Fri Nov 20 14:36:24 CET 2009. -------- --- ipsec-tools/ipsec-tools.changes 2009-09-23 21:37:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/ipsec-tools/ipsec-tools.changes 2009-11-03 20:18:50.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Nov 3 19:09:21 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Tue Oct 6 20:09:15 CEST 2009 - chris(a)computersalat.de + +- cleanup spec + o sorted sections + o simplify clean + o sort install section + o sort files section +- added missing /etc/racoon/cert DIR + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipsec-tools.spec ++++++ --- /var/tmp/diff_new_pack.bkUq0c/_old 2009-11-20 14:35:57.000000000 +0100 +++ /var/tmp/diff_new_pack.bkUq0c/_new 2009-11-20 14:35:57.000000000 +0100 @@ -21,7 +21,7 @@ Name: ipsec-tools Summary: IPsec Utilities Version: 0.7.3 -Release: 1 +Release: 2 License: BSD 3-clause (or similar) Group: Productivity/Networking/Security AutoReqProv: on @@ -122,21 +122,22 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 0755 $RPM_SOURCE_DIR/racoon.init $RPM_BUILD_ROOT/etc/init.d/racoon ln -sf /etc/init.d/racoon $RPM_BUILD_ROOT/usr/sbin/rcracoon +mkdir -p $RPM_BUILD_ROOT/etc/pam.d +install -m 0644 %{S:4} $RPM_BUILD_ROOT/etc/pam.d/racoon +%{__install} -d $RPM_BUILD_ROOT/etc/racoon/cert +install -m 0600 src/racoon/samples/psk.txt $RPM_BUILD_ROOT/etc/racoon/ +install -m 0644 src/racoon/samples/racoon.conf $RPM_BUILD_ROOT/etc/racoon/ +cp -v $RPM_SOURCE_DIR/setkey.conf.sample $RPM_BUILD_ROOT/etc/racoon/setkey.conf mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 $RPM_SOURCE_DIR/sysconfig.racoon $RPM_BUILD_ROOT/var/adm/fillup-templates/ +touch $RPM_BUILD_ROOT/var/run/racoon/racoon.sock +# manage doc mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/examples/{setkey,racoon} cp -rv src/racoon/samples $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/examples/racoon cp -v src/setkey/sample* $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/examples/setkey for i in ChangeLog NEWS README; do install -D -m 0644 $i $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/ done -mkdir -p $RPM_BUILD_ROOT/etc/racoon -install -m 0600 src/racoon/samples/psk.txt $RPM_BUILD_ROOT/etc/racoon/ -install -m 0644 src/racoon/samples/racoon.conf $RPM_BUILD_ROOT/etc/racoon/ -cp -v $RPM_SOURCE_DIR/setkey.conf.sample $RPM_BUILD_ROOT/etc/racoon/setkey.conf -touch $RPM_BUILD_ROOT/var/run/racoon/racoon.sock -mkdir -p $RPM_BUILD_ROOT/etc/pam.d -install -m 0644 %{S:4} $RPM_BUILD_ROOT/etc/pam.d/racoon #some rpmlint stuff %if 0%{?suse_version} >= 1100 %fdupes -s $RPM_BUILD_ROOT/ @@ -145,29 +146,27 @@ %post %{fillup_and_insserv racoon} -%postun -%{insserv_cleanup} - %preun %stop_on_removal racoon +%postun +%{insserv_cleanup} + %clean -if test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/"; then - rm -rf $RPM_BUILD_ROOT -fi +%{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%dir /etc/racoon +%doc /usr/share/doc/packages/%{name}/ %config(noreplace) /etc/racoon/psk.txt %config(noreplace) /etc/racoon/racoon.conf %config(noreplace) /etc/racoon/setkey.conf %config /etc/init.d/racoon %config /etc/pam.d/racoon +%dir /etc/racoon +%dir /etc/racoon/cert /usr/sbin/rcracoon %dir /usr/include/libipsec/ -%doc /usr/share/doc/packages/%{name}/ -/var/adm/fillup-templates/sysconfig.racoon /usr/include/libipsec/libpfkey.h /usr/%{_lib}/libipsec.a /usr/%{_lib}/libipsec.la @@ -175,6 +174,7 @@ /usr/sbin/racoonctl /usr/sbin/setkey /usr/sbin/plainrsa-gen +/var/adm/fillup-templates/sysconfig.racoon /var/run/racoon %ghost /var/run/racoon/racoon.sock %{_mandir}/man*/* ++++++ no_werror.patch ++++++ --- /var/tmp/diff_new_pack.bkUq0c/_old 2009-11-20 14:35:57.000000000 +0100 +++ /var/tmp/diff_new_pack.bkUq0c/_new 2009-11-20 14:35:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- ipsec-tools-0.6-fixed/configure 2005-08-02 15:08:25.000000000 +0200 -+++ ipsec-tools-0.6/configure 2005-08-03 11:40:47.000000000 +0200 -@@ -20752,7 +20752,7 @@ +Index: ipsec-tools-0.7.3/configure +=================================================================== +--- ipsec-tools-0.7.3.orig/configure ++++ ipsec-tools-0.7.3/configure +@@ -20922,7 +20922,7 @@ echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } @@ -9,9 +11,9 @@ case $host in *netbsd*) -@@ -23288,7 +23288,7 @@ - echo "$as_me:$LINENO: checking if printf accepts %z" >&5 - echo $ECHO_N "checking if printf accepts %z... $ECHO_C" >&6 +@@ -23505,7 +23505,7 @@ echo "$as_me: WARNING: Using a generic f + { echo "$as_me:$LINENO: checking if printf accepts %z" >&5 + echo $ECHO_N "checking if printf accepts %z... $ECHO_C" >&6; } saved_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS -Wall -Werror" +CFLAGS="$CFLAGS -Wall" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pam_mount for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package pam_mount for openSUSE:Factory checked in at Fri Nov 20 14:35:26 CET 2009. -------- --- pam_mount/pam_mount.changes 2009-07-27 12:08:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/pam_mount/pam_mount.changes 2009-11-19 11:16:07.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 19 11:12:36 CET 2009 - mc(a)suse.de + +- backport some code to fix the sudo crash (bnc#544154) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pam_mount-1.27-fix-krb5-env.dif pam_mount-1.27-fix-mtab-handling.dif pam_mount-1.27-fix-sudo-crash.dif pam_mount-1.27-uid_guid-handling.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_mount.spec ++++++ --- /var/tmp/diff_new_pack.weqtqg/_old 2009-11-20 14:34:44.000000000 +0100 +++ /var/tmp/diff_new_pack.weqtqg/_new 2009-11-20 14:34:44.000000000 +0100 @@ -26,7 +26,7 @@ BuildRequires: linux-kernel-headers >= 2.6 Summary: A PAM Module that can Mount Volumes for a User Session Version: 1.27 -Release: 1 +Release: 2 # psmisc: /bin/fuser Recommends: cryptsetup Recommends: cifs-mount xfsprogs @@ -40,6 +40,10 @@ Source3: mount.crypt Source4: mount.encfs13 Patch1: pam_mount-0.47-enable-logout-kill.dif +Patch2: pam_mount-1.27-fix-sudo-crash.dif +Patch3: pam_mount-1.27-fix-mtab-handling.dif +Patch4: pam_mount-1.27-uid_guid-handling.dif +Patch5: pam_mount-1.27-fix-krb5-env.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pam-mount.sourceforge.net/ PreReq: coreutils, perl-XML-Writer, perl-XML-Parser @@ -60,6 +64,10 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %{suse_update_config -f} ++++++ pam_mount-0.47-enable-logout-kill.dif ++++++ --- /var/tmp/diff_new_pack.weqtqg/_old 2009-11-20 14:34:44.000000000 +0100 +++ /var/tmp/diff_new_pack.weqtqg/_new 2009-11-20 14:34:44.000000000 +0100 @@ -1,6 +1,8 @@ ---- orig/pam_mount-0.47/config/pam_mount.conf.xml 2008-09-05 05:28:34.000000000 +0200 -+++ pam_mount-0.47/config/pam_mount.conf.xml 2009-01-10 17:52:15.000000000 +0100 -@@ -33,7 +33,7 @@ +Index: pam_mount-1.27/config/pam_mount.conf.xml +=================================================================== +--- pam_mount-1.27.orig/config/pam_mount.conf.xml ++++ pam_mount-1.27/config/pam_mount.conf.xml +@@ -29,7 +29,7 @@ <mntoptions require="nosuid,nodev" /> <path>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin</path> ++++++ pam_mount-1.27-fix-krb5-env.dif ++++++ Index: pam_mount-1.27/doc/changelog.txt =================================================================== --- pam_mount-1.27.orig/doc/changelog.txt +++ pam_mount-1.27/doc/changelog.txt @@ -4,6 +4,7 @@ For details, see the history as recorded Fixes: - pam_mount: avoid crash in sudo by not calling setenv() with NULL +- pam_mount: unwind krb5 environment info at the right time - umount.crypt: do not remove entry from /etc/mtab twice v1.27 (July 01 2009) Index: pam_mount-1.27/src/pam_mount.c =================================================================== --- pam_mount-1.27.orig/src/pam_mount.c +++ pam_mount-1.27/src/pam_mount.c @@ -550,9 +550,10 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open ret = PAM_SERVICE_ERR; } } - memset(system_authtok, 0, strlen(system_authtok)); - if (krb5 != NULL) - unsetenv("KRB5CCNAME"); + if (system_authtok != NULL) { + memset(system_authtok, 0, strlen(system_authtok)); + free(system_authtok); + } modify_pm_count(&Config, Config.user, "1"); envpath_restore(); if (getuid() == 0) @@ -570,6 +571,8 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open */ ret = PAM_SUCCESS; out: + if (krb5 != NULL) + unsetenv("KRB5CCNAME"); w4rn("done opening session (ret=%d)\n", ret); common_exit(); return ret; ++++++ pam_mount-1.27-fix-mtab-handling.dif ++++++ Index: pam_mount-1.27/doc/changelog.txt =================================================================== --- pam_mount-1.27.orig/doc/changelog.txt +++ pam_mount-1.27/doc/changelog.txt @@ -4,7 +4,7 @@ For details, see the history as recorded Fixes: - pam_mount: avoid crash in sudo by not calling setenv() with NULL - +- umount.crypt: do not remove entry from /etc/mtab twice v1.27 (July 01 2009) ==================== Index: pam_mount-1.27/src/mtcrypt.c =================================================================== --- pam_mount-1.27.orig/src/mtcrypt.c +++ pam_mount-1.27/src/mtcrypt.c @@ -563,9 +563,8 @@ static int mtcr_umount(struct umount_opt umount_args[argk++] = "umount"; #ifdef __linux__ - umount_args[argk++] = "-i"; - if (opt->no_update) - umount_args[argk++] = "-n"; + /* Always pass in -n, as we manually edit /etc/mtab */ + umount_args[argk++] = "-ni"; #endif umount_args[argk++] = mountpoint; umount_args[argk] = NULL; ++++++ pam_mount-1.27-fix-sudo-crash.dif ++++++ diff --git a/doc/changelog.txt b/doc/changelog.txt index 5107e9b..bdc37f0 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -2,6 +2,10 @@ For details, see the history as recorded in the git repository. +Fixes: +- pam_mount: avoid crash in sudo by not calling setenv() with NULL + + v1.27 (July 01 2009) ==================== Changes: diff --git a/src/pam_mount.c b/src/pam_mount.c index 87262bd..73da556 100644 --- a/src/pam_mount.c +++ b/src/pam_mount.c @@ -451,7 +451,7 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open_session(pam_handle_t *pamh, int flags, { struct vol *vol; int ret; - unsigned int krb5_set; + const char *krb5; char *system_authtok = NULL; const void *tmp; int getval; @@ -464,11 +464,17 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open_session(pam_handle_t *pamh, int flags, w4rn(PACKAGE_STRING ": entering session stage\n"); /* + * Environment variables set with setenv() only last while PAM is + * active, i.e. disappear when the shell is started. On the other hand, + * variabled fed to pam_putenv() are only visible once the shell + * started. + */ + /* * Get the Kerberos CCNAME so we can make it available to the * mount command later on. */ - krb5_set = getenv("KRB5CCNAME") != NULL; - if (setenv("KRB5CCNAME", pam_getenv(pamh, "KRB5CCNAME"), 1) < 0) + krb5 = pam_getenv(pamh, "KRB5CCNAME"); + if (krb5 != NULL && setenv("KRB5CCNAME", krb5, true) < 0) l0g("KRB5CCNAME setenv failed\n"); /* Store initialized config as PAM data */ @@ -545,7 +551,7 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open_session(pam_handle_t *pamh, int flags, } } memset(system_authtok, 0, strlen(system_authtok)); - if (krb5_set) + if (krb5 != NULL) unsetenv("KRB5CCNAME"); modify_pm_count(&Config, Config.user, "1"); envpath_restore(); ++++++ pam_mount-1.27-uid_guid-handling.dif ++++++ diff --git a/src/rdconf1.c b/src/rdconf1.c index 0a90de7..9ec29f8 100644 --- a/src/rdconf1.c +++ b/src/rdconf1.c @@ -959,8 +959,7 @@ static int rc_volume_cond_uid(const struct passwd *pwd, xmlNode *node) continue; ret = __rc_volume_cond_id(signed_cast(const char *, node->content), pwd->pw_uid); - if (ret < 0) - return ret; + return ret; } l0g("config: empty or invalid content for <%s>\n", "uid"); @@ -981,8 +980,7 @@ static int rc_volume_cond_gid(const struct passwd *pwd, xmlNode *node) continue; ret = __rc_volume_cond_id(signed_cast(const char *, node->content), pwd->pw_gid); - if (ret < 0) - return ret; + return ret; } l0g("config: empty or invalid content for <%s>\n", "gid"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 qjackctl for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package qjackctl for openSUSE:Factory checked in at Fri Nov 20 14:33:39 CET 2009. -------- --- qjackctl/qjackctl.changes 2009-08-31 11:46:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/qjackctl/qjackctl.changes 2009-11-17 11:11:20.000000000 +0100 @@ -1,0 +2,32 @@ +Mon Nov 16 19:43:44 UTC 2009 - mseben(a)novell.com + +- updated to 0.3.5: + * Late support for UTF-8 encoded client/port names. + * Allow only one single patchbay connection to or from an + exclusive socket. + * Automatic crash-dump reports, debugger stack-traces (gdb), + back-traces, whatever, are being introduced as a brand new configure + option (--enable-stacktrace) and default enabled on debug build + targets (--enable-debug). + * Probable fix on the audio connections with regard to client/port + (re)name changes (an ancient bug reported by Fons Adriaensen). + * Portaudio device selector is now available (after a patch + handed by Torben Hohn and Stephane Letz). + * A couple of primitive D-Bus interface slots have been introduced, + giving the option to start/stop the jackd server from the system + bus eg. via dbus-send --system / org.rncbc.qjackctl.start (.stop), + (a nice addition supplied by Robin Gareus, thanks). + * New command line option (-a, --active-patchbay=path) to specify and + activate a given patchbay definition file (a simple patch sent by + John Schneiderman, thanks). + * Added one significant digit to DSP Load percentage status display. + * Tentative support for netjack (slave) by adding the "net" driver to + the existing backend driver options on the Setup/Settings section. + * Converted obsolete QMessageBox forms to standard buttons. + * New patchbay snapshot now raises the dirty flag and allows for + the immediate salvage of patchbay definition profile. + * Conditional build for JACK port aliases support (JACK >= 0.109.2). + * Alternate icon sizes other than default 16x16, are now effective to + the Connections widget (Setup/Dislay/Connections Window/Icon size). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- qjackctl-0.3.4.tar.bz2 New: ---- qjackctl-0.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qjackctl.spec ++++++ --- /var/tmp/diff_new_pack.61e46R/_old 2009-11-20 14:32:55.000000000 +0100 +++ /var/tmp/diff_new_pack.61e46R/_new 2009-11-20 14:32:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package qjackctl (Version 0.3.4) +# spec file for package qjackctl (Version 0.3.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: qjackctl BuildRequires: alsa-devel libjack-devel libqt4-devel update-desktop-files Summary: Qt-based interface to JACK -Version: 0.3.4 -Release: 2 +Version: 0.3.5 +Release: 1 Group: Productivity/Multimedia/Sound/Utilities License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ qjackctl-0.3.4.tar.bz2 -> qjackctl-0.3.5.tar.bz2 ++++++ ++++ 23191 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 clisp for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package clisp for openSUSE:Factory checked in at Fri Nov 20 14:28:21 CET 2009. -------- --- clisp/clisp.changes 2009-08-26 13:07:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/clisp/clisp.changes 2009-11-03 20:16:25.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:09:10 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clisp.spec ++++++ --- /var/tmp/diff_new_pack.Ovoykr/_old 2009-11-20 14:26:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Ovoykr/_new 2009-11-20 14:26:55.000000000 +0100 @@ -32,7 +32,7 @@ PreReq: vim AutoReqProv: on Version: 2.44.1 -Release: 63 +Release: 64 Summary: A Common Lisp Interpreter Url: http://clisp.cons.org Source0: ftp://ftp.gnu.org/pub/gnu/clisp/latest/clisp-%{version}.tar.bz2 ++++++ clisp-2.36-alloca.patch ++++++ --- /var/tmp/diff_new_pack.Ovoykr/_old 2009-11-20 14:26:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Ovoykr/_new 2009-11-20 14:26:55.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/spvw.d -+++ src/spvw.d 2005-12-15 14:47:54.000000000 +0100 -@@ -3546,7 +3546,7 @@ +Index: src/spvw.d +=================================================================== +--- src/spvw.d.orig ++++ src/spvw.d +@@ -3632,7 +3632,7 @@ nonreturning_function(local, error_dlerr returns: non-NULL pointer to the symbol in the library */ local void* get_module_symbol (const char* format, const char* modname, void* libhandle) { @@ -8,4 +10,4 @@ + var char * symbolbuf = (char *)alloca(strlen(format)+strlen(modname)); sprintf(symbolbuf,format,modname); var void * ret = find_name(libhandle,symbolbuf); - if (ret == NULL) fehler_dlerror("dlsym",symbolbuf,dlerror()); + if (ret == NULL) error_dlerror("dlsym",symbolbuf,dlerror()); ++++++ clisp-2.39-ia64-wooh.dif ++++++ --- /var/tmp/diff_new_pack.Ovoykr/_old 2009-11-20 14:26:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Ovoykr/_new 2009-11-20 14:26:55.000000000 +0100 @@ -1,6 +1,8 @@ ---- tests/streams.tst -+++ tests/streams.tst 2006-07-25 17:58:55.000000000 +0200 -@@ -1022,8 +1022,8 @@ T +Index: tests/streams.tst +=================================================================== +--- tests/streams.tst.orig ++++ tests/streams.tst +@@ -1031,8 +1031,8 @@ T (describe (make-array nil :element-type nil) s))) T @@ -9,5 +11,5 @@ +;(stringp (with-output-to-string (s) (describe nil s))) +;T - (WITH-INPUT-FROM-STRING (*S* "abcde") - (DECLARE (SPECIAL *S*)) + ;; https://sourceforge.net/tracker/index.php?func=detail&aid=1622642&group_id=… + (let ((s "a b")) ++++++ clisp-2.44.1-map_variable.patch ++++++ --- /var/tmp/diff_new_pack.Ovoykr/_old 2009-11-20 14:26:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Ovoykr/_new 2009-11-20 14:26:55.000000000 +0100 @@ -1,8 +1,10 @@ ---- ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in -+++ ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in 2003-12-10 22:04:30.000000000 -0800 -@@ -31,4 +31,9 @@ - extern void* trampoline_r_data1 (); - #endif +Index: ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in +=================================================================== +--- ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in.orig ++++ ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in +@@ -22,4 +22,9 @@ extern __TR_function trampoline_r_addres + extern void* trampoline_r_data0 (void*); + extern void* trampoline_r_data1 (void*); +/* http://article.gmane.org/gmane.lisp.clisp.general/7485 */ +#ifndef MAP_VARIABLE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libzrtpcpp for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package libzrtpcpp for openSUSE:Factory checked in at Fri Nov 20 14:26:26 CET 2009. -------- --- libzrtpcpp/libzrtpcpp.changes 2008-09-08 14:22:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/libzrtpcpp/libzrtpcpp.changes 2009-11-03 20:20:13.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:09:29 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzrtpcpp.spec ++++++ --- /var/tmp/diff_new_pack.4GgmDM/_old 2009-11-20 14:26:09.000000000 +0100 +++ /var/tmp/diff_new_pack.4GgmDM/_new 2009-11-20 14:26:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libzrtpcpp (Version 1.3.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Summary: A ccrtp extension for zrtp/Zfone support BuildRequires: gcc-c++ libccrtp-devel libgcc libgcrypt-devel pkgconfig Version: 1.3.0 -Release: 1 +Release: 2 License: GPL v3 or later Group: Development/Libraries/Other Url: http://www.gnu.org/software/commoncpp/commoncpp.html @@ -40,7 +40,7 @@ %package -n libzrtpcpp1 -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Group: Development/Libraries/Other Summary: A ccrtp extension for zrtp/Zfone support Provides: %{name} = %{version} ++++++ libzrtpcpp-1.0.1-compiler_warnings.patch ++++++ --- /var/tmp/diff_new_pack.4GgmDM/_old 2009-11-20 14:26:09.000000000 +0100 +++ /var/tmp/diff_new_pack.4GgmDM/_new 2009-11-20 14:26:09.000000000 +0100 @@ -1,11 +1,13 @@ ---- src/ZrtpStateClass.cxx +Index: src/ZrtpStateClass.cxx +=================================================================== +--- src/ZrtpStateClass.cxx.orig +++ src/ZrtpStateClass.cxx -@@ -815,7 +815,7 @@ - DEBUGOUT((cout << "Checking for match in SecureState.\n")); +@@ -1032,7 +1032,7 @@ void ZrtpStateClass::evWaitConfAck(void) + DEBUGOUT((cout << "Checking for match in WaitConfAck.\n")); char *msg, first, last; - uint8_t *pkt; + uint8_t *pkt = NULL; if (event->type == ZrtpPacket) { - pkt = event->data.packet; + pkt = event->data.packet; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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