April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit kdepim4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at Thu Apr 1 18:16:41 CEST 2010. -------- --- KDE/kdepim4/kdepim4.changes 2010-02-26 20:56:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes 2010-03-26 19:19:56.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 26 19:19:49 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepim-4.4.1.tar.bz2 New: ---- kdepim-4.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.jnr8EK/_old 2010-04-01 18:16:34.000000000 +0200 +++ /var/tmp/diff_new_pack.jnr8EK/_new 2010-04-01 18:16:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdepim4 (Version 4.4.1) +# spec file for package kdepim4 (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,7 +33,7 @@ Group: System/GUI/KDE Summary: Base package of kdepim Url: http://www.kde.org -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdepim-%version.tar.bz2 Patch: 4_4_BRANCH.diff @@ -729,6 +729,5 @@ %doc %lang(en) %_kde4_htmldir/en/kioslave/news %doc %lang(en) %_kde4_htmldir/en/kwatchgnupg %_kde4_mandir/man1/kabcclient.1.gz -/usr/share/akonadi/agents/nepomukemailfeeder.desktop %changelog ++++++ kdepim-4.4.1.tar.bz2 -> kdepim-4.4.2.tar.bz2 ++++++ KDE/kdepim4/kdepim-4.4.1.tar.bz2 /mounts/work_src_done/STABLE/kdepim4/kdepim-4.4.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 hamster-applet for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package hamster-applet for openSUSE:Factory checked in at Thu Apr 1 18:16:37 CEST 2010. -------- --- hamster-applet/hamster-applet.changes 2010-03-08 17:31:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/hamster-applet/hamster-applet.changes 2010-03-31 14:25:35.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Mar 31 14:24:41 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 2.30.0.1: + + bgo#614452 - load translations in standalone mode + +------------------------------------------------------------------- +Mon Mar 29 15:08:03 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 2.30.0: + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hamster-applet-2.29.92.tar.bz2 New: ---- hamster-applet-2.30.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hamster-applet.spec ++++++ --- /var/tmp/diff_new_pack.Vrizut/_old 2010-04-01 16:29:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Vrizut/_new 2010-04-01 16:29:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hamster-applet (Version 2.29.92) +# spec file for package hamster-applet (Version 2.30.0.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,7 +31,7 @@ BuildRequires: python-gtk-devel BuildRequires: update-desktop-files Summary: A GNOME panel applet that allows you to track where you spend your time -Version: 2.29.92 +Version: 2.30.0.1 Release: 1 License: GPLv3+ Group: Productivity/Other ++++++ hamster-applet-2.29.92.tar.bz2 -> hamster-applet-2.30.0.1.tar.bz2 ++++++ ++++ 19977 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 perl for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package perl for openSUSE:Factory checked in at Thu Apr 1 18:16:30 CEST 2010. -------- --- perl/perl.changes 2010-02-12 11:54:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl/perl.changes 2010-03-31 19:26:26.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Mar 31 19:24:32 CEST 2010 - mls(a)suse.de + +- update to perl-5.12.0-RC1 + * mostly documentation updates + * some regression fixes + +------------------------------------------------------------------- +Wed Mar 24 14:05:46 CET 2010 - mls(a)suse.de + +- update to perl-5.12.0-RC0 + * new ... operator + * unicode improvements + * "each" now also works on arrays + * support for "delete local" + * suidperl was dropped + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perl-5.10.1.dif perl-5.10.1.tar.bz2 perl-threads.diff New: ---- perl-5.12.0-RC1.tar.bz2 perl-5.12.0.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl.spec ++++++ --- /var/tmp/diff_new_pack.YRpOSr/_old 2010-04-01 18:15:49.000000000 +0200 +++ /var/tmp/diff_new_pack.YRpOSr/_new 2010-04-01 18:15:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl (Version 5.10.1) +# spec file for package perl (Version 5.11.99.RC1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,24 +20,24 @@ Name: perl Summary: The Perl interpreter -Version: 5.10.1 -Release: 5 +Version: 5.11.99.RC1 +Release: 1 +%define pversion 5.12.0 License: Artistic License .. ; GPLv2+ Group: Development/Languages/Perl AutoReqProv: on Url: http://www.perl.org/ -Source: perl-%{version}.tar.bz2 +Source: perl-5.12.0-RC1.tar.bz2 Source1: %name-rpmlintrc Source2: macros.perl Source3: README.macros Source4: baselibs.conf -Patch0: perl-%{version}.dif +Patch0: perl-%{pversion}.dif Patch1: perl-gracefull-net-ftp.diff Patch2: perl-fix_dbmclose_call.patch Patch3: perl-regexp-refoverflow.diff Patch4: perl-nroff.diff Patch5: perl-netcmdutf8.diff -Patch6: perl-threads.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: perl-base = %version #PreReq: %fillup_prereq @@ -45,6 +45,10 @@ #Requires: gzip # needed in SuSEconfig.perl Recommends: perl-doc = %version # +%if "%version" != "%pversion" +Provides: perl = %pversion-%release +%endif +Provides: perl(:MODULE_COMPAT_%pversion) Provides: perl-500 Provides: perl-macros Obsoletes: perl-macros @@ -133,7 +137,7 @@ Larry Wall, Louis J. LaBash, Jr. <llabash(a)siue.edu> %prep -%setup -q -n perl-5.10.1 +%setup -q -n perl-5.12.0-RC1 cp -p %{S:3} . %patch0 %patch1 @@ -141,9 +145,9 @@ %patch3 %patch4 %patch5 -%patch6 %build +cp -a lib savelib export SUSE_ASNEEDED=0 export BZIP2_LIB=%{_libdir} export BZIP2_INCLUDE=%{_includedir} @@ -161,20 +165,19 @@ chmod 755 ./configure.gnu ./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Duseshrplib=\'true\' $options make %{?jobs:-j%jobs}; -mv libperl.so savelibperl.so -mv lib/Config.pm saveConfig.pm -mv lib/Config_heavy.pl saveConfig_heavy.pl +cp -p libperl.so savelibperl.so +cp -p lib/Config.pm saveConfig.pm +cp -p lib/Config_heavy.pl saveConfig_heavy.pl +make clean > /dev/null make clobber +rm -rf lib +mv savelib lib ./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm $options make %{?jobs:-j%jobs}; -%ifnarch %arm %check +%ifnarch %arm export SUSE_ASNEEDED=0 -# delete broken File::Find test -rm -f lib/File/Find/t/find.t -# delete racy test -rm -f t/op/getppid.t make test %endif @@ -218,7 +221,7 @@ $RPM_BUILD_ROOT/usr/bin/perl -e '$r=chr(128)."\\x{100}";/$r/' # test perl-regexp-refoverflow.diff $RPM_BUILD_ROOT/usr/bin/perl -e '/\6666666666/' -%if 1 +%if 0 # remove unrelated target/os manpages rm $RPM_BUILD_ROOT/usr/share/man/man1/perlaix.1* rm $RPM_BUILD_ROOT/usr/share/man/man1/perlamiga.1* @@ -253,81 +256,81 @@ rm $RPM_BUILD_ROOT/usr/share/man/man1/perlwin32.1* %endif cat << EOF > perl-base-filelist -/usr/lib/perl5/%version/Carp.pm -/usr/lib/perl5/%version/Carp/ -/usr/lib/perl5/%version/Class/ -/usr/lib/perl5/%version/Config/ -/usr/lib/perl5/%version/Digest.pm -/usr/lib/perl5/%version/Digest/ -/usr/lib/perl5/%version/Exporter.pm -/usr/lib/perl5/%version/Exporter/ -/usr/lib/perl5/%version/File/ -/usr/lib/perl5/%version/Getopt/ -/usr/lib/perl5/%version/IPC/ -/usr/lib/perl5/%version/Text/ -/usr/lib/perl5/%version/Tie/Hash.pm -/usr/lib/perl5/%version/warnings.pm -/usr/lib/perl5/%version/warnings/ -/usr/lib/perl5/%version/AutoLoader.pm -/usr/lib/perl5/%version/FileHandle.pm -/usr/lib/perl5/%version/SelectSaver.pm -/usr/lib/perl5/%version/Symbol.pm -/usr/lib/perl5/%version/attributes.pm -/usr/lib/perl5/%version/base.pm -/usr/lib/perl5/%version/bytes.pm -/usr/lib/perl5/%version/bytes_heavy.pl -/usr/lib/perl5/%version/constant.pm -/usr/lib/perl5/%version/fields.pm -/usr/lib/perl5/%version/feature.pm -/usr/lib/perl5/%version/integer.pm -/usr/lib/perl5/%version/locale.pm -/usr/lib/perl5/%version/overload.pm -/usr/lib/perl5/%version/strict.pm -/usr/lib/perl5/%version/utf8.pm -/usr/lib/perl5/%version/utf8_heavy.pl -/usr/lib/perl5/%version/vars.pm -/usr/lib/perl5/%version/version.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/Data/ -/usr/lib/perl5/%version/*-linux-thread-multi*/Digest/ -/usr/lib/perl5/%version/*-linux-thread-multi*/File/ -/usr/lib/perl5/%version/*-linux-thread-multi*/List/ -/usr/lib/perl5/%version/*-linux-thread-multi*/Scalar/ -/usr/lib/perl5/%version/*-linux-thread-multi*/IO.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Dir.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/IO/File.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Handle.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Pipe.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Poll.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Seekable.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Select.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Socket.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Socket/ -/usr/lib/perl5/%version/*-linux-thread-multi*/B.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/B/Deparse.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/Config.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/Config_heavy.pl -/usr/lib/perl5/%version/*-linux-thread-multi*/Cwd.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/DynaLoader.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/Errno.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/Fcntl.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/POSIX.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/Socket.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/XSLoader.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Data/ -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Digest/ -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Fcntl/ -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/File/ -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/IO/ -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/List/ -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Cwd/ -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/DynaLoader/ -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Socket/ -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX/POSIX.bs -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX/POSIX.so -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX/autosplit.ix -/usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX/load_imports.al -/usr/lib/perl5/%version/*-linux-thread-multi*/lib.pm -/usr/lib/perl5/%version/*-linux-thread-multi*/re.pm +/usr/lib/perl5/%pversion/B/Deparse.pm +/usr/lib/perl5/%pversion/Carp.pm +/usr/lib/perl5/%pversion/Carp/ +/usr/lib/perl5/%pversion/Class/ +/usr/lib/perl5/%pversion/Config/ +/usr/lib/perl5/%pversion/Digest.pm +/usr/lib/perl5/%pversion/Digest/ +/usr/lib/perl5/%pversion/Exporter.pm +/usr/lib/perl5/%pversion/Exporter/ +/usr/lib/perl5/%pversion/File/ +/usr/lib/perl5/%pversion/Getopt/ +/usr/lib/perl5/%pversion/IPC/ +/usr/lib/perl5/%pversion/Text/ +/usr/lib/perl5/%pversion/Tie/Hash.pm +/usr/lib/perl5/%pversion/XSLoader.pm +/usr/lib/perl5/%pversion/warnings.pm +/usr/lib/perl5/%pversion/warnings/ +/usr/lib/perl5/%pversion/AutoLoader.pm +/usr/lib/perl5/%pversion/FileHandle.pm +/usr/lib/perl5/%pversion/SelectSaver.pm +/usr/lib/perl5/%pversion/Symbol.pm +/usr/lib/perl5/%pversion/base.pm +/usr/lib/perl5/%pversion/bytes.pm +/usr/lib/perl5/%pversion/bytes_heavy.pl +/usr/lib/perl5/%pversion/constant.pm +/usr/lib/perl5/%pversion/fields.pm +/usr/lib/perl5/%pversion/feature.pm +/usr/lib/perl5/%pversion/integer.pm +/usr/lib/perl5/%pversion/locale.pm +/usr/lib/perl5/%pversion/overload.pm +/usr/lib/perl5/%pversion/strict.pm +/usr/lib/perl5/%pversion/utf8.pm +/usr/lib/perl5/%pversion/utf8_heavy.pl +/usr/lib/perl5/%pversion/vars.pm +/usr/lib/perl5/%pversion/version.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/Data/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/Digest/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/File/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/List/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/Scalar/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Dir.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/File.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Handle.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Pipe.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Poll.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Seekable.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Select.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Socket.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Socket/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/B.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/Config.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/Config_heavy.pl +/usr/lib/perl5/%pversion/*-linux-thread-multi*/Cwd.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/DynaLoader.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/Errno.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/Fcntl.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/POSIX.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/Socket.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/attributes.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Data/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Digest/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Fcntl/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/File/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/IO/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/List/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Cwd/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/DynaLoader/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Socket/ +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX/POSIX.bs +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX/POSIX.so +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX/autosplit.ix +/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX/load_imports.al +/usr/lib/perl5/%pversion/*-linux-thread-multi*/lib.pm +/usr/lib/perl5/%pversion/*-linux-thread-multi*/re.pm EOF { sed -e 's/^/%%exclude /' perl-base-filelist @@ -344,21 +347,19 @@ %files base -f perl-base-filelist %defattr(-,root,root) %dir /usr/lib/perl5 -%dir /usr/lib/perl5/%version -%dir /usr/lib/perl5/%version/*-linux-thread-multi* -%dir /usr/lib/perl5/%version/*-linux-thread-multi*/auto -%dir /usr/lib/perl5/%version/*-linux-thread-multi*/B -%dir /usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX +%dir /usr/lib/perl5/%pversion +%dir /usr/lib/perl5/%pversion/B +%dir /usr/lib/perl5/%pversion/*-linux-thread-multi* +%dir /usr/lib/perl5/%pversion/*-linux-thread-multi*/auto +%dir /usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX /usr/bin/perl -/usr/bin/perl%version -/usr/bin/suidperl +/usr/bin/perl%pversion %doc /usr/share/man/man1/perl.1.gz %files -f perl-base-excludes %defattr(-,root,root) %exclude /usr/bin/perl -%exclude /usr/bin/perl%version -%exclude /usr/bin/suidperl +%exclude /usr/bin/perl%pversion %exclude /usr/lib/perl5/*/Unicode/*/*.txt %exclude /usr/lib/perl5/*/unicore/*.txt /usr/bin/* ++++++ perl-5.10.1.dif -> perl-5.12.0.dif ++++++ --- perl/perl-5.10.1.dif 2009-09-04 09:54:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl/perl-5.12.0.dif 2010-03-24 14:41:11.000000000 +0100 @@ -1,6 +1,6 @@ ---- ./Configure.orig 2009-08-18 19:03:53.000000000 +0000 -+++ ./Configure 2009-09-04 07:02:18.000000000 +0000 -@@ -109,7 +109,7 @@ paths="$paths /usr/5bin /etc /usr/gnu/bi +--- ./Configure.orig 2010-02-18 18:53:53.000000000 +0000 ++++ ./Configure 2010-03-23 11:31:19.000000000 +0000 +@@ -114,7 +114,7 @@ paths="$paths /usr/5bin /etc /usr/gnu/bi paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" @@ -9,7 +9,7 @@ paths="$paths /sbin /usr/sbin /usr/libexec" paths="$paths /system/gnu_library/bin" -@@ -1307,7 +1307,7 @@ loclibpth="/usr/local/lib /opt/local/lib +@@ -1316,7 +1316,7 @@ loclibpth="/usr/local/lib /opt/local/lib loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" : general looking path for locating libraries @@ -18,7 +18,7 @@ glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" test -f /shlib/libc.so && glibpth="/shlib $glibpth" -@@ -2366,7 +2366,7 @@ uname +@@ -2375,7 +2375,7 @@ uname zip " pth=`echo $PATH | sed -e "s/$p_/ /g"` @@ -27,7 +27,7 @@ for file in $loclist; do eval xxx=\$$file case "$xxx" in -@@ -11173,7 +11173,7 @@ void xxx(int n, ...) +@@ -11202,7 +11202,7 @@ void xxx(int n, ...) va_start(args, n); exit((unsigned long)vsprintf(buf,"%s",args) > 10L); } @@ -36,7 +36,7 @@ #else /* I_VARARGS */ -@@ -11185,7 +11185,7 @@ va_dcl +@@ -11214,7 +11214,7 @@ va_dcl va_start(args); exit((unsigned long)vsprintf(buf,"%s",args) > 10L); } @@ -45,7 +45,7 @@ #endif -@@ -18908,14 +18908,20 @@ int main(int argc, char *argv[]) +@@ -19017,14 +19017,20 @@ int main(int argc, char *argv[]) } EOCP set try @@ -66,7 +66,7 @@ i_db=$undef case " $libs " in *"-ldb "*) -@@ -18958,7 +18964,7 @@ int main() +@@ -19067,7 +19073,7 @@ int main() } #endif EOCP @@ -75,7 +75,7 @@ if $contains warning try.out >>/dev/null 2>&1 ; then db_hashtype='int' else -@@ -19003,7 +19009,7 @@ int main() +@@ -19112,7 +19118,7 @@ int main() } #endif EOCP @@ -84,7 +84,7 @@ if $contains warning try.out >>/dev/null 2>&1 ; then db_prefixtype='int' else -@@ -22973,7 +22979,7 @@ passcat='$passcat' +@@ -23111,7 +23117,7 @@ passcat='$passcat' patchlevel='$patchlevel' path_sep='$path_sep' perl5='$perl5' @@ -93,8 +93,8 @@ perl_patchlevel='$perl_patchlevel' perladmin='$perladmin' perllibs='$perllibs' ---- ./SuSE/SuSEconfig.perl.orig 2009-09-04 07:01:37.000000000 +0000 -+++ ./SuSE/SuSEconfig.perl 2009-09-04 07:01:37.000000000 +0000 +--- ./SuSE/SuSEconfig.perl.orig 2010-03-23 11:31:19.000000000 +0000 ++++ ./SuSE/SuSEconfig.perl 2010-03-23 11:31:19.000000000 +0000 @@ -0,0 +1,76 @@ +#! /bin/bash +# @@ -172,8 +172,8 @@ +# +# end of file SuSEconfig.perl +# ---- ./SuSE/perllocal.SuSE.orig 2009-09-04 07:01:37.000000000 +0000 -+++ ./SuSE/perllocal.SuSE 2009-09-04 07:01:37.000000000 +0000 +--- ./SuSE/perllocal.SuSE.orig 2010-03-23 11:31:19.000000000 +0000 ++++ ./SuSE/perllocal.SuSE 2010-03-23 11:31:19.000000000 +0000 @@ -0,0 +1,84 @@ +#!/usr/bin/perl +# Copyright (c) 1998 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved. @@ -259,8 +259,8 @@ + print "SuSEconfig.perl: Can't write to file $Config{'installarchlib'}/perllocal.pod !\n\n"; +} + ---- ./SuSE/sysconfig.suseconfig-perl.orig 2009-09-04 07:01:37.000000000 +0000 -+++ ./SuSE/sysconfig.suseconfig-perl 2009-09-04 07:01:37.000000000 +0000 +--- ./SuSE/sysconfig.suseconfig-perl.orig 2010-03-23 11:31:19.000000000 +0000 ++++ ./SuSE/sysconfig.suseconfig-perl 2010-03-23 11:31:19.000000000 +0000 @@ -0,0 +1,8 @@ +## Path: System/SuSEconfig +## Type: yesno @@ -270,8 +270,42 @@ +# May SuSEconfig modify your perllocal.pod? (yes/no) +# +CREATE_PERLLOCAL_POD="yes" ---- ./ext/Compress-Raw-Zlib/config.in.orig 2009-04-14 18:20:34.000000000 +0000 -+++ ./ext/Compress-Raw-Zlib/config.in 2009-09-04 07:01:37.000000000 +0000 +--- ./cpan/CGI/lib/CGI/Fast.pm.orig 2010-03-23 15:04:37.000000000 +0000 ++++ ./cpan/CGI/lib/CGI/Fast.pm 2010-03-23 15:05:01.000000000 +0000 +@@ -26,6 +26,9 @@ use vars qw( + ); + @ISA = ('CGI'); + ++# FCGI is missing from the perl distri ++our $RPM_Ignore_Requires = "perl(FCGI)"; ++ + # workaround for known bug in libfcgi + while (($ignore) = each %ENV) { } + +--- ./cpan/CPAN/lib/CPAN.pm.orig 2010-03-23 15:23:09.000000000 +0000 ++++ ./cpan/CPAN/lib/CPAN.pm 2010-03-23 15:23:20.000000000 +0000 +@@ -64,7 +64,7 @@ sub _uniq; + + no lib "."; + +-require Mac::BuildTools if $^O eq 'MacOS'; ++#require Mac::BuildTools if $^O eq 'MacOS'; + if ($ENV{PERL5_CPAN_IS_RUNNING} && $$ != $ENV{PERL5_CPAN_IS_RUNNING}) { + $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION} ||= $ENV{PERL5_CPAN_IS_RUNNING}; + my @rec = _uniq split(/,/, $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION}), $$; +--- ./cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm.orig 2010-03-23 15:12:55.000000000 +0000 ++++ ./cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm 2010-03-23 15:13:29.000000000 +0000 +@@ -237,6 +237,8 @@ Thanks! :-) + . + }; + ++our $RPM_Ignore_Requires = "perl(Your::Module::Here)"; ++ + use constant REPORT_MISSING_TESTS + => sub { + return << "."; +--- ./cpan/Compress-Raw-Zlib/config.in.orig 2010-03-23 15:01:12.000000000 +0000 ++++ ./cpan/Compress-Raw-Zlib/config.in 2010-03-23 15:02:19.000000000 +0000 @@ -16,9 +16,9 @@ # Setting the Gzip OS Code # @@ -285,18 +319,19 @@ OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT ---- ./ext/DynaLoader/hints/linux.pl.orig 2009-02-12 22:58:11.000000000 +0000 -+++ ./ext/DynaLoader/hints/linux.pl 2009-09-04 07:01:37.000000000 +0000 -@@ -2,4 +2,7 @@ - # Some Linux releases like to hide their <nlist.h> - $self->{CCFLAGS} = $Config{ccflags} . ' -I/usr/include/libelf' - if -f "/usr/include/libelf/nlist.h"; -+# Some silly modules like mod_perl use DynaLoader.a in a shared -+# module, so add cccdlflags if we're going for a shared libperl -+$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}" if $Config{'useshrplib'} eq 'true'; - 1; ---- ./ext/Encode/bin/enc2xs.orig 2009-04-12 17:18:06.000000000 +0000 -+++ ./ext/Encode/bin/enc2xs 2009-09-04 07:01:37.000000000 +0000 +--- ./cpan/Cwd/lib/File/Spec/VMS.pm.orig 2010-03-23 15:10:49.000000000 +0000 ++++ ./cpan/Cwd/lib/File/Spec/VMS.pm 2010-03-23 15:11:11.000000000 +0000 +@@ -12,6 +12,8 @@ $VERSION = eval $VERSION; + use File::Basename; + use VMS::Filespec; + ++our $RPM_Ignore_Requires = "perl(VMS::Filespec)"; ++ + =head1 NAME + + File::Spec::VMS - methods for VMS file specs +--- ./cpan/Encode/bin/enc2xs.orig 2010-03-23 11:34:24.000000000 +0000 ++++ ./cpan/Encode/bin/enc2xs 2010-03-23 11:35:34.000000000 +0000 @@ -1005,13 +1005,13 @@ sub make_configlocal_pm { $LocalMod{$enc} ||= $mod; } @@ -313,8 +348,66 @@ $_LocalVer = _mkversion(); $_E2X = find_e2x(); $_Inc = $INC{"Encode.pm"}; ---- ./ext/NDBM_File/Makefile.PL.orig 2009-04-19 17:02:38.000000000 +0000 -+++ ./ext/NDBM_File/Makefile.PL 2009-09-04 07:01:37.000000000 +0000 +--- ./cpan/File-Temp/Temp.pm.orig 2010-03-23 15:11:55.000000000 +0000 ++++ ./cpan/File-Temp/Temp.pm 2010-03-23 15:12:16.000000000 +0000 +@@ -146,7 +146,7 @@ use File::Path qw/ rmtree /; + use Fcntl 1.03; + use IO::Seekable; # For SEEK_* + use Errno; +-require VMS::Stdio if $^O eq 'VMS'; ++#require VMS::Stdio if $^O eq 'VMS'; + + # pre-emptively load Carp::Heavy. If we don't when we run out of file + # handles and attempt to call croak() we get an error message telling +--- ./cpan/Sys-Syslog/t/syslog.t.orig 2010-03-23 14:58:56.000000000 +0000 ++++ ./cpan/Sys-Syslog/t/syslog.t 2010-03-23 15:00:07.000000000 +0000 +@@ -206,6 +206,7 @@ SKIP: { + } + } + else { ++ $r = 1 unless -e '/dev/log'; + ok( $r, "setlogsock() should return true: '$r'" ); + } + +--- ./cpan/libnet/Net/Config.pm.orig 2010-03-23 15:06:09.000000000 +0000 ++++ ./cpan/libnet/Net/Config.pm 2010-03-23 15:06:27.000000000 +0000 +@@ -37,7 +37,7 @@ eval { local $SIG{__DIE__}; require Net: + # Try to get as much configuration info as possible from InternetConfig + # + $^O eq 'MacOS' and eval <<TRY_INTERNET_CONFIG; +-use Mac::InternetConfig; ++#use Mac::InternetConfig; + + { + my %nc = ( +--- ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm.orig 2010-03-23 15:21:32.000000000 +0000 ++++ ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm 2010-03-23 15:22:29.000000000 +0000 +@@ -206,8 +206,11 @@ foreach my $key (sort(keys(%{$self->{dat + { + if (! -e $key) + { +- push(@missing, $key); +- delete($self->{data}{$key}) if ($remove); ++ if (($key !~ m!/man/!) || ! -e "$key.gz") ++ { ++ push(@missing, $key); ++ delete($self->{data}{$key}) if ($remove); ++ } + } + } + return(@missing); +--- ./ext/DynaLoader/hints/linux.pl.orig 2009-02-08 21:40:12.000000000 +0000 ++++ ./ext/DynaLoader/hints/linux.pl 2010-03-23 11:31:19.000000000 +0000 +@@ -2,4 +2,7 @@ + # Some Linux releases like to hide their <nlist.h> + $self->{CCFLAGS} = $Config{ccflags} . ' -I/usr/include/libelf' + if -f "/usr/include/libelf/nlist.h"; ++# Some silly modules like mod_perl use DynaLoader.a in a shared ++# module, so add cccdlflags if we're going for a shared libperl ++$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}" if $Config{'useshrplib'} eq 'true'; + 1; +--- ./ext/NDBM_File/Makefile.PL.orig 2010-01-18 18:43:45.000000000 +0000 ++++ ./ext/NDBM_File/Makefile.PL 2010-03-23 11:31:19.000000000 +0000 @@ -2,6 +2,7 @@ use ExtUtils::MakeMaker; WriteMakefile( NAME => 'NDBM_File', @@ -323,8 +416,8 @@ XSPROTOARG => '-noprototypes', # XXX remove later? VERSION_FROM => 'NDBM_File.pm', INC => ($^O eq "MacOS" ? "-i ::::db:include" : "") ---- ./ext/ODBM_File/Makefile.PL.orig 2009-04-19 17:02:38.000000000 +0000 -+++ ./ext/ODBM_File/Makefile.PL 2009-09-04 07:01:37.000000000 +0000 +--- ./ext/ODBM_File/Makefile.PL.orig 2010-01-18 18:43:45.000000000 +0000 ++++ ./ext/ODBM_File/Makefile.PL 2010-03-23 11:31:19.000000000 +0000 @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; WriteMakefile( @@ -334,8 +427,8 @@ XSPROTOARG => '-noprototypes', # XXX remove later? VERSION_FROM => 'ODBM_File.pm', ); ---- ./ext/ODBM_File/hints/linux.pl.orig 2009-02-12 22:58:12.000000000 +0000 -+++ ./ext/ODBM_File/hints/linux.pl 2009-09-04 07:01:37.000000000 +0000 +--- ./ext/ODBM_File/hints/linux.pl.orig 2010-01-18 18:43:45.000000000 +0000 ++++ ./ext/ODBM_File/hints/linux.pl 2010-03-23 11:31:19.000000000 +0000 @@ -1,5 +1,5 @@ # uses GDBM dbm compatibility feature - at least on SuSE 8.0 -$self->{LIBS} = ['-lgdbm']; @@ -343,18 +436,8 @@ # Debian/Ubuntu have /usr/lib/libgdbm_compat.so.3* but not this file, # so linking may fail ---- ./ext/Sys-Syslog/t/syslog.t.orig 2009-06-10 16:53:46.000000000 +0000 -+++ ./ext/Sys-Syslog/t/syslog.t 2009-09-04 07:01:37.000000000 +0000 -@@ -213,6 +213,7 @@ SKIP: { - } - } - else { -+ $r = 1 unless -e '/dev/log'; - ok( $r, "setlogsock() should return true: '$r'" ); - } - ---- ./hints/linux.sh.orig 2009-02-12 22:58:12.000000000 +0000 -+++ ./hints/linux.sh 2009-09-04 07:01:37.000000000 +0000 +--- ./hints/linux.sh.orig 2010-01-18 18:52:49.000000000 +0000 ++++ ./hints/linux.sh 2010-03-23 11:31:19.000000000 +0000 @@ -50,12 +50,14 @@ ignore_versioned_solibs='y' # BSD compatibility library no longer needed # 'kaffe' has a /usr/lib/libnet.so which is not at all relevant for perl. @@ -392,7 +475,7 @@ libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` libc=/lib/$libc fi -@@ -143,9 +156,14 @@ case "$optimize" in +@@ -148,9 +161,14 @@ case "$optimize" in esac ;; esac @@ -407,7 +490,7 @@ # Are we using ELF? Thanks to Kenneth Albanowski <kjahds(a)kjahds.com> # for this test. cat >try.c <<'EOM' -@@ -230,6 +248,29 @@ EOM +@@ -235,6 +253,29 @@ EOM esac fi @@ -426,7 +509,7 @@ + +usedl='true' +dlsrc='dl_dlopen.xs' -+d_dosuid='define' ++d_dosuid='undef' +d_bincompat3='y' + +# We don't want to add /usr/local/include and /usr/local/lib to the search @@ -437,7 +520,7 @@ rm -f try.c a.out if /bin/sh -c exit; then -@@ -279,6 +320,9 @@ else +@@ -284,6 +325,9 @@ else echo "Couldn't find tcsh. Csh-based globbing might be broken." fi fi @@ -447,7 +530,7 @@ # Shimpei Yamashita <shimpei(a)socrates.patnet.caltech.edu> # Message-Id: <33EF1634.B36B6500(a)pobox.com> -@@ -357,6 +401,8 @@ $define|true|[yY]*) +@@ -362,6 +406,8 @@ $define|true|[yY]*) d_localtime_r_proto="$define" d_random_r_proto="$define" @@ -456,126 +539,9 @@ ;; esac EOCBU ---- ./installperl.orig 2009-08-13 22:40:10.000000000 +0000 -+++ ./installperl 2009-09-04 07:01:37.000000000 +0000 -@@ -235,7 +235,7 @@ if ($Is_VMS) { # Hang in there until Fi - - # Do some quick sanity checks. - --if (!$opts{notify} && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; } -+#if (!$opts{notify} && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; } - - $installbin || die "No installbin directory in config.sh\n"; - -d $installbin || mkpath($installbin, $opts{verbose}, 0777); -@@ -344,7 +344,11 @@ else { - safe_unlink("$installbin/s$perl_verbase$ver$exe_ext"); - if ($d_dosuid) { - copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext"); -- chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext"); -+ if ($>) { -+ chmod(0711, "$installbin/s$perl_verbase$ver$exe_ext"); -+ } else { -+ chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext"); -+ } - } - - # Install library files. ---- ./lib/CGI/Fast.pm.orig 2009-02-12 22:58:12.000000000 +0000 -+++ ./lib/CGI/Fast.pm 2009-09-04 07:01:37.000000000 +0000 -@@ -19,6 +19,9 @@ use CGI; - use FCGI; - @ISA = ('CGI'); - -+# FCGI is missing from the perl distri -+our $RPM_Ignore_Requires = "perl(FCGI)"; -+ - # workaround for known bug in libfcgi - while (($ignore) = each %ENV) { } - ---- ./lib/CPAN.pm.orig 2009-06-27 21:21:54.000000000 +0000 -+++ ./lib/CPAN.pm 2009-09-04 07:01:37.000000000 +0000 -@@ -64,7 +64,7 @@ sub _uniq; - - no lib "."; - --require Mac::BuildTools if $^O eq 'MacOS'; -+#require Mac::BuildTools if $^O eq 'MacOS'; - if ($ENV{PERL5_CPAN_IS_RUNNING} && $$ != $ENV{PERL5_CPAN_IS_RUNNING}) { - $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION} ||= $ENV{PERL5_CPAN_IS_RUNNING}; - my @rec = _uniq split(/,/, $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION}), $$; ---- ./lib/CPANPLUS/Internals/Constants/Report.pm.orig 2009-05-03 23:51:10.000000000 +0000 -+++ ./lib/CPANPLUS/Internals/Constants/Report.pm 2009-09-04 07:01:37.000000000 +0000 -@@ -236,6 +236,8 @@ Thanks! :-) - . - }; - -+our $RPM_Ignore_Requires = "perl(Your::Module::Here)"; -+ - use constant REPORT_MISSING_TESTS - => sub { - return << "."; ---- ./lib/Carp/Heavy.pm.orig 2009-02-12 22:58:13.000000000 +0000 -+++ ./lib/Carp/Heavy.pm 2009-09-04 07:01:37.000000000 +0000 -@@ -30,6 +30,7 @@ $CarpInternal{warnings}++; - $Internal{Exporter}++; - $Internal{'Exporter::Heavy'}++; - -+our $RPM_Ignore_Requires = "perl(Carp::Heavy)"; - - our ($CarpLevel, $MaxArgNums, $MaxEvalLen, $MaxArgLen, $Verbose); - ---- ./lib/ExtUtils/Packlist.pm.orig 2009-02-12 22:58:13.000000000 +0000 -+++ ./lib/ExtUtils/Packlist.pm 2009-09-04 07:01:37.000000000 +0000 -@@ -202,8 +202,11 @@ foreach my $key (sort(keys(%{$self->{dat - { - if (! -e $key) - { -- push(@missing, $key); -- delete($self->{data}{$key}) if ($remove); -+ if (($key !~ m!/man/!) || ! -e "$key.gz") -+ { -+ push(@missing, $key); -+ delete($self->{data}{$key}) if ($remove); -+ } - } - } - return(@missing); ---- ./lib/File/Spec/VMS.pm.orig 2009-05-10 23:30:12.000000000 +0000 -+++ ./lib/File/Spec/VMS.pm 2009-09-04 07:01:37.000000000 +0000 -@@ -12,6 +12,8 @@ $VERSION = eval $VERSION; - use File::Basename; - use VMS::Filespec; - -+our $RPM_Ignore_Requires = "perl(VMS::Filespec)"; -+ - =head1 NAME - - File::Spec::VMS - methods for VMS file specs ---- ./lib/File/Temp.pm.orig 2009-06-30 13:13:54.000000000 +0000 -+++ ./lib/File/Temp.pm 2009-09-04 07:01:37.000000000 +0000 -@@ -146,7 +146,7 @@ use File::Path qw/ rmtree /; - use Fcntl 1.03; - use IO::Seekable; # For SEEK_* - use Errno; --require VMS::Stdio if $^O eq 'VMS'; -+#require VMS::Stdio if $^O eq 'VMS'; - - # pre-emptively load Carp::Heavy. If we don't when we run out of file - # handles and attempt to call croak() we get an error message telling ---- ./lib/Net/Config.pm.orig 2009-02-12 22:58:14.000000000 +0000 -+++ ./lib/Net/Config.pm 2009-09-04 07:01:37.000000000 +0000 -@@ -37,7 +37,7 @@ eval { local $SIG{__DIE__}; require Net: - # Try to get as much configuration info as possible from InternetConfig - # - $^O eq 'MacOS' and eval <<TRY_INTERNET_CONFIG; --use Mac::InternetConfig; -+#use Mac::InternetConfig; - - { - my %nc = ( ---- ./lib/perl5db.pl.orig 2009-07-25 22:36:07.000000000 +0000 -+++ ./lib/perl5db.pl 2009-09-04 07:01:37.000000000 +0000 -@@ -3396,6 +3396,8 @@ reading another. +--- ./lib/perl5db.pl.orig 2010-01-18 18:52:49.000000000 +0000 ++++ ./lib/perl5db.pl 2010-03-23 11:31:19.000000000 +0000 +@@ -3400,6 +3400,8 @@ reading another. open( OUT, ">&STDOUT" ) # XXX: lost message || &warn("Can't restore DB::OUT"); } @@ -584,7 +550,7 @@ next CMD; } ## end unless ($piped = open(OUT,... -@@ -3520,6 +3522,8 @@ our standard filehandles for input and o +@@ -3524,6 +3526,8 @@ our standard filehandles for input and o # if necessary, close(SAVEOUT); select($selected), $selected = "" unless $selected eq ""; @@ -593,19 +559,8 @@ # No pipes now. $piped = ""; ---- ./lib/unicore/mktables.orig 2009-04-12 20:56:19.000000000 +0000 -+++ ./lib/unicore/mktables 2009-09-04 07:01:37.000000000 +0000 -@@ -149,7 +149,7 @@ foreach my $lib ('To', 'lib', - map {File::Spec->catdir("lib",$_)} - qw(gc_sc dt bc hst ea jt lb nt ccc)) { - next if -d $lib; -- mkdir $lib, 0755 or die "mkdir '$lib': $!"; -+ mkdir $lib, 0755 or $! =~ /exists/i or die "mkdir '$lib': $!"; - } - - my $LastUnicodeCodepoint = 0x10FFFF; # As of Unicode 5.1. ---- ./locale.c.orig 2009-03-19 19:56:24.000000000 +0000 -+++ ./locale.c 2009-09-04 07:01:37.000000000 +0000 +--- ./locale.c.orig 2010-01-18 18:52:49.000000000 +0000 ++++ ./locale.c 2010-03-23 11:31:19.000000000 +0000 @@ -357,9 +357,15 @@ Perl_init_i18nl10n(pTHX_ int printwarn) if (setlocale_failure) { @@ -622,30 +577,8 @@ if (locwarn) { #ifdef LC_ALL ---- ./t/TEST.orig 2009-08-04 22:06:15.000000000 +0000 -+++ ./t/TEST 2009-09-04 07:01:37.000000000 +0000 -@@ -156,6 +156,7 @@ unless (@ARGV) { - next if $skip{$flat_extension}; # Foo/Bar may live in Foo-Bar - } - my $path = File::Spec->catfile($updir, $t); -+ next unless -e $path; - push @ARGV, $path; - $::path_to_name{$path} = $t; - } ---- ./t/harness.orig 2009-04-19 16:47:00.000000000 +0000 -+++ ./t/harness 2009-09-04 07:01:37.000000000 +0000 -@@ -199,7 +199,8 @@ if (@ARGV) { - $flat_extension =~ s!-!/!g; - next if $skip{$flat_extension}; # Foo/Bar may live in Foo-Bar - } -- push @manitests, File::Spec->catfile($updir, $test); -+ my $t = File::Spec->catfile($updir, $test); -+ push @manitests, $t if -e $t; - } - } - close MANI; ---- ./t/op/numconvert.t.orig 2009-06-10 16:53:47.000000000 +0000 -+++ ./t/op/numconvert.t 2009-09-04 07:01:37.000000000 +0000 +--- ./t/op/numconvert.t.orig 2010-01-18 18:43:46.000000000 +0000 ++++ ./t/op/numconvert.t 2010-03-23 11:31:19.000000000 +0000 @@ -46,7 +46,7 @@ my $max_chain = $ENV{PERL_TEST_NUMCONVER # Bulk out if unsigned type is hopelessly wrong: @@ -655,9 +588,9 @@ my $big_iv = do {use integer; $max_uv1 * 16}; # 16 is an arbitrary number here my $max_uv_less3 = $max_uv1 - 3; ---- ./utils/perlbug.PL.orig 2009-08-12 18:49:24.000000000 +0000 -+++ ./utils/perlbug.PL 2009-09-04 07:01:37.000000000 +0000 -@@ -1077,6 +1077,7 @@ sub _message_headers { +--- ./utils/perlbug.PL.orig 2010-03-07 17:53:22.000000000 +0000 ++++ ./utils/perlbug.PL 2010-03-23 11:31:19.000000000 +0000 +@@ -1083,6 +1083,7 @@ sub _message_headers { $headers{'Cc'} = $cc if ($cc); $headers{'Message-Id'} = $messageid if ($messageid); $headers{'Reply-To'} = $from if ($from); ++++++ perl-gracefull-net-ftp.diff ++++++ --- /var/tmp/diff_new_pack.YRpOSr/_old 2010-04-01 18:15:49.000000000 +0200 +++ /var/tmp/diff_new_pack.YRpOSr/_new 2010-04-01 18:15:49.000000000 +0200 @@ -9,8 +9,8 @@ With this patch, LWP clients see a status_line of "500 This server is busy, ..." 2006-12-20, jw(a)suse.de ---- lib/Net/FTP.pm.orig 2007-12-18 10:47:07.000000000 +0000 -+++ lib/Net/FTP.pm 2008-01-07 10:08:30.000000000 +0000 +--- cpan/libnet/Net/FTP.pm.orig 2007-12-18 10:47:07.000000000 +0000 ++++ cpan/libnet/Net/FTP.pm 2008-01-07 10:08:30.000000000 +0000 @@ -107,7 +107,7 @@ sub new { unless ($ftp->response() == CMD_OK) { @@ -38,8 +38,8 @@ (${*$ftp}{'net_cmd_code'}, 1); } ---- lib/Net/Cmd.pm.orig 2007-12-18 10:47:07.000000000 +0000 -+++ lib/Net/Cmd.pm 2008-01-07 10:09:34.000000000 +0000 +--- cpan/libnet/Net/Cmd.pm.orig 2007-12-18 10:47:07.000000000 +0000 ++++ cpan/libnet/Net/Cmd.pm 2008-01-07 10:09:34.000000000 +0000 @@ -353,6 +353,7 @@ sub response { ($code, $more) = $cmd->parse_response($str); unless (defined $code) { ++++++ perl-netcmdutf8.diff ++++++ --- /var/tmp/diff_new_pack.YRpOSr/_old 2010-04-01 18:15:49.000000000 +0200 +++ /var/tmp/diff_new_pack.YRpOSr/_new 2010-04-01 18:15:49.000000000 +0200 @@ -1,5 +1,5 @@ ---- ./lib/Net/Cmd.pm.orig 2009-09-03 14:32:13.000000000 +0000 -+++ ./lib/Net/Cmd.pm 2009-09-03 14:47:30.000000000 +0000 +--- ./cpan/libnet/Net/Cmd.pm.orig 2009-09-03 14:32:13.000000000 +0000 ++++ ./cpan/libnet/Net/Cmd.pm 2009-09-03 14:47:30.000000000 +0000 @@ -226,6 +226,10 @@ sub command { $str = $cmd->toascii($str) if $tr; $str .= "\015\012"; ++++++ perl-nroff.diff ++++++ --- /var/tmp/diff_new_pack.YRpOSr/_old 2010-04-01 18:15:49.000000000 +0200 +++ /var/tmp/diff_new_pack.YRpOSr/_new 2010-04-01 18:15:49.000000000 +0200 @@ -1,6 +1,6 @@ ---- ./lib/Pod/Perldoc.pm.orig 2009-01-14 14:57:51.000000000 +0000 -+++ ./lib/Pod/Perldoc.pm 2009-01-14 14:58:15.000000000 +0000 -@@ -648,7 +648,7 @@ sub options_processing { +--- dist/Pod-Perldoc/lib/Pod/Perldoc.pm.orig 2010-02-17 14:35:24.000000000 +0000 ++++ dist/Pod-Perldoc/lib/Pod/Perldoc.pm 2010-03-23 15:40:17.000000000 +0000 +@@ -655,7 +655,7 @@ sub options_processing { $self->options_sanity; @@ -8,4 +8,4 @@ + $self->opt_n("nroff -c") unless $self->opt_n; $self->add_formatter_option( '__nroffer' => $self->opt_n ); - # Adjust for using translation packages + # Get language from PERLDOC_POD2 environment variable ++++++ perl-regexp-refoverflow.diff ++++++ --- /var/tmp/diff_new_pack.YRpOSr/_old 2010-04-01 18:15:49.000000000 +0200 +++ /var/tmp/diff_new_pack.YRpOSr/_new 2010-04-01 18:15:49.000000000 +0200 @@ -1,6 +1,6 @@ ---- ./regcomp.c.orig 2009-07-27 21:37:52.000000000 +0000 -+++ ./regcomp.c 2009-09-03 14:36:50.000000000 +0000 -@@ -5787,7 +5787,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I +--- regcomp.c.orig 2010-02-28 20:12:22.000000000 +0000 ++++ regcomp.c 2010-03-23 15:38:55.000000000 +0000 +@@ -5818,7 +5818,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I ret = reganode(pRExC_state, GOSUB, num); if (!SIZE_ONLY) { @@ -9,7 +9,7 @@ RExC_parse++; vFAIL("Reference to nonexistent group"); } -@@ -7234,7 +7234,7 @@ tryagain: +@@ -7260,7 +7260,7 @@ tryagain: if (num < 1) vFAIL("Reference to nonexistent or unclosed group"); } @@ -18,7 +18,7 @@ goto defchar; else { char * const parse_start = RExC_parse - 1; /* MJD */ -@@ -7248,7 +7248,7 @@ tryagain: +@@ -7274,7 +7274,7 @@ tryagain: RExC_parse++; } if (!SIZE_ONLY) { @@ -27,7 +27,7 @@ vFAIL("Reference to nonexistent group"); } RExC_sawback = 1; -@@ -7425,7 +7425,7 @@ tryagain: +@@ -7451,7 +7451,7 @@ tryagain: case '0': case '1': case '2': case '3':case '4': case '5': case '6': case '7': case '8':case '9': if (*p == '0' || ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdeutils4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdeutils4 for openSUSE:Factory checked in at Thu Apr 1 18:15:32 CEST 2010. -------- --- KDE/kdeutils4/kdeutils4.changes 2010-02-26 20:59:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes 2010-03-26 19:38:05.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 26 19:37:58 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdeutils-4.4.1.tar.bz2 New: ---- kdeutils-4.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils4.spec ++++++ --- /var/tmp/diff_new_pack.IojuBd/_old 2010-04-01 18:15:27.000000000 +0200 +++ /var/tmp/diff_new_pack.IojuBd/_new 2010-04-01 18:15:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeutils4 (Version 4.4.1) +# spec file for package kdeutils4 (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -40,7 +40,7 @@ Group: Productivity/Other Summary: Base Package of KDE Utility Programs Url: http://www.kde.org -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdeutils-%version.tar.bz2 Patch: 4_4_BRANCH.diff ++++++ 4_4_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.IojuBd/_old 2010-04-01 18:15:27.000000000 +0200 +++ /var/tmp/diff_new_pack.IojuBd/_new 2010-04-01 18:15:27.000000000 +0200 @@ -1,7 +1,67 @@ -package: kdeutils-4.3.1.tar.bz2 +package: kdeutils-4.4.2.tar.bz2 kdemod: kdeutils --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1027747 -+svn di between //tags/KDE/4.3.1/kdeutils and //branches/KDE/4.3/kdeutils ++current HEAD: 1109066 ++svn di between //tags/KDE/4.4.2/kdeutils and //branches/KDE/4.4/kdeutils +--- ark/plugins/libarchive/libarchivehandler.cpp ++++ ark/plugins/libarchive/libarchivehandler.cpp +@@ -341,12 +341,16 @@ + } else if (filename().right(3).toUpper() == "BZ2") { + kDebug() << "Detected bzip2 compression for new file"; + ret = archive_write_set_compression_bzip2(arch_writer); ++#ifdef ARCHIVE_COMPRESSION_XZ + } else if (filename().right(2).toUpper() == "XZ") { + kDebug() << "Detected xz compression for new file"; + ret = archive_write_set_compression_xz(arch_writer); ++#endif ++#ifdef ARCHIVE_COMPRESSION_LZMA + } else if (filename().right(4).toUpper() == "LZMA") { + kDebug() << "Detected lzma compression for new file"; + ret = archive_write_set_compression_lzma(arch_writer); ++#endif + } else if (filename().right(3).toUpper() == "TAR") { + kDebug() << "Detected no compression for new file (pure tar)"; + ret = archive_write_set_compression_none(arch_writer); +@@ -372,12 +376,16 @@ + case ARCHIVE_COMPRESSION_BZIP2: + ret = archive_write_set_compression_bzip2(arch_writer); + break; ++#ifdef ARCHIVE_COMPRESSION_XZ + case ARCHIVE_COMPRESSION_XZ: + ret = archive_write_set_compression_xz(arch_writer); + break; ++#endif ++#ifdef ARCHIVE_COMPRESSION_LZMA + case ARCHIVE_COMPRESSION_LZMA: + ret = archive_write_set_compression_lzma(arch_writer); + break; ++#endif + case ARCHIVE_COMPRESSION_NONE: + ret = archive_write_set_compression_none(arch_writer); + break; +@@ -505,12 +513,16 @@ + case ARCHIVE_COMPRESSION_BZIP2: + ret = archive_write_set_compression_bzip2(arch_writer); + break; ++#ifdef ARCHIVE_COMPRESSION_XZ + case ARCHIVE_COMPRESSION_XZ: + ret = archive_write_set_compression_xz(arch_writer); + break; ++#endif ++#ifdef ARCHIVE_COMPRESSION_LZMA + case ARCHIVE_COMPRESSION_LZMA: + ret = archive_write_set_compression_lzma(arch_writer); + break; ++#endif + case ARCHIVE_COMPRESSION_NONE: + ret = archive_write_set_compression_none(arch_writer); + break; + +Property changes on: . +___________________________________________________________________ +Added: svn:externals + + + + ++++++ kdeutils-4.4.1.tar.bz2 -> kdeutils-4.4.2.tar.bz2 ++++++ ++++ 2768 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 kdetoys4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdetoys4 for openSUSE:Factory checked in at Thu Apr 1 18:15:27 CEST 2010. -------- --- KDE/kdetoys4/kdetoys4.changes 2010-02-26 20:58:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdetoys4/kdetoys4.changes 2010-03-26 19:37:44.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 26 19:37:35 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdetoys-4.4.1.tar.bz2 New: ---- kdetoys-4.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdetoys4.spec ++++++ --- /var/tmp/diff_new_pack.dZlhj7/_old 2010-04-01 18:15:22.000000000 +0200 +++ /var/tmp/diff_new_pack.dZlhj7/_new 2010-04-01 18:15:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdetoys4 (Version 4.4.1) +# spec file for package kdetoys4 (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: Kdetoys Base Package Url: http://www.kde.org -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdetoys-%version.tar.bz2 Patch: 4_4_BRANCH.diff ++++++ kdetoys-4.4.1.tar.bz2 -> kdetoys-4.4.2.tar.bz2 ++++++ Files old/kdetoys-4.4.1/doc/amor/index.cache.bz2 and new/kdetoys-4.4.2/doc/amor/index.cache.bz2 differ Files old/kdetoys-4.4.1/doc/kteatime/index.cache.bz2 and new/kdetoys-4.4.2/doc/kteatime/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.4.1/doc/kteatime/index.docbook new/kdetoys-4.4.2/doc/kteatime/index.docbook --- old/kdetoys-4.4.1/doc/kteatime/index.docbook 2010-02-26 19:35:39.000000000 +0100 +++ new/kdetoys-4.4.2/doc/kteatime/index.docbook 2010-03-26 18:30:35.000000000 +0100 @@ -68,7 +68,7 @@ <sect1 id="timing-your-tea"> <title>Timing Your Tea</title> -<para>Upon starting, the panel icon will be that of an empty tea mug. If you click on the mug and select your tea, the icon will change to a filled mug. After the specified time, the tea will be finished, and a suitable message box will be shown. At this point, you can close the message box by clicking on it and reset the timer by clicking on the icon. The mug will be shown as empty again.</para> +<para>Upon starting, the panel icon will be that of an tea mug. If you click with the &RMB; on the mug and select your tea, an animated clock visualizing the remaining time is displayed on the the icon. After the specified time, the tea will be finished, and a suitable message box will be shown. At this point, you can close the message box by clicking on it. This resets also the timer and the clock on the mug disappears again.</para> <note><para>The timer should only be reset by those who really enjoy tea.</para></note> Files old/kdetoys-4.4.1/doc/kweather/index.cache.bz2 and new/kdetoys-4.4.2/doc/kweather/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.4.1/kteatime/src/kteatime.desktop new/kdetoys-4.4.2/kteatime/src/kteatime.desktop --- old/kdetoys-4.4.1/kteatime/src/kteatime.desktop 2010-01-20 00:24:57.000000000 +0100 +++ new/kdetoys-4.4.2/kteatime/src/kteatime.desktop 2010-03-26 18:30:35.000000000 +0100 @@ -22,7 +22,7 @@ Name[gl]=KTeaTime Name[he]=KTeaTime Name[hne]=के-टी-टाइम -Name[hr]=KVrijeme za čaj +Name[hr]=KTeaTime Name[hu]=KTeaTime Name[is]=KTeaTime Name[it]=KTeaTime @@ -83,7 +83,7 @@ GenericName[gl]=Quece-chá GenericName[he]=מבשל התה GenericName[hne]=चाय केतली -GenericName[hr]=Čajnik +GenericName[hr]=Pomoćnik za kuhanje čaja GenericName[hu]=Teafőző GenericName[is]=Te hitarinn GenericName[it]=Teiera diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.4.1/kteatime/src/kteatime.notifyrc new/kdetoys-4.4.2/kteatime/src/kteatime.notifyrc --- old/kdetoys-4.4.1/kteatime/src/kteatime.notifyrc 2010-01-20 00:24:57.000000000 +0100 +++ new/kdetoys-4.4.2/kteatime/src/kteatime.notifyrc 2010-03-26 18:30:35.000000000 +0100 @@ -22,7 +22,7 @@ Comment[ga]=Cócaire Tae KDE Comment[gl]=O quece-chá de KDE Comment[hne]=केडीई चाय केतली -Comment[hr]=KDE čajnik +Comment[hr]=KDE-ov pomoćnik za kuhanje čaja Comment[hu]=KDE teafőző Comment[is]=KDE te hitarinn Comment[it]=La teiera di KDE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpm for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Thu Apr 1 18:15:24 CEST 2010. -------- --- rpm/rpm.changes 2010-02-24 11:58:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2010-03-26 16:30:17.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 26 16:29:36 CET 2010 - mls(a)suse.de + +- port sles11-sp1 repackage-nomd5.diff and safeugid.diff + +------------------------------------------------------------------- +Fri Mar 26 11:49:59 CET 2010 - mls(a)suse.de + +- update to rpm-4.8.0 + * updated python bindings + * new transaction ordering code + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fixabsfilelists.diff fixqueryreturn.diff rpm-4.7.1.tar.bz2 New: ---- modemuncher.diff repackage-nomd5.diff rpm-4.8.0.tar.bz2 rpmdb-no-svc.diff safeugid.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rpm-python (Version 4.7.1) +# spec file for package rpm-python (Version 4.8.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ License: GPLv2+ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages -Version: 4.7.1 -Release: 9 +Version: 4.8.0 +Release: 1 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rpm (Version 4.7.1) +# spec file for package rpm (Version 4.8.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,8 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager -Version: 4.7.1 -Release: 9 +Version: 4.8.0 +Release: 1 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -98,11 +98,13 @@ Patch62: debuglink.diff Patch63: debuginfo-mono.patch Patch64: allowufdio.diff -Patch65: fixabsfilelists.diff -Patch66: fixqueryreturn.diff -Patch67: lazystatfs.diff -Patch68: defclean.diff -Patch69: readlineofi.diff +Patch65: lazystatfs.diff +Patch66: defclean.diff +Patch67: readlineofi.diff +Patch68: rpmdb-no-svc.diff +Patch69: modemuncher.diff +Patch70: repackage-nomd5.diff +Patch71: safeugid.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -163,6 +165,7 @@ %patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 +%patch -P 70 -P 71 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov @@ -180,7 +183,7 @@ %ifarch alpha export CFLAGS="-g -O0 -fno-strict-aliasing" %endif -cp /usr/share/gettext/config.rpath . +#cp -p /usr/share/gettext/config.rpath . cp autogen.sh beecrypt pushd beecrypt ./autogen.sh --with-pic ++++++ allowufdio.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,19 +1,17 @@ -Index: build/pack.c -=================================================================== ---- build/pack.c.orig -+++ build/pack.c -@@ -379,7 +379,9 @@ rpmRC writeRPM(Header *hdrp, unsigned ch +--- ./build/pack.c.orig 2010-03-25 15:18:23.000000000 +0000 ++++ ./build/pack.c 2010-03-25 15:23:54.000000000 +0000 +@@ -375,7 +375,9 @@ rpmRC writeRPM(Header *hdrp, unsigned ch const char *compr = NULL; headerPutString(h, RPMTAG_PAYLOADFORMAT, "cpio"); -- if (strcmp(s+1, "gzdio") == 0) { -+ if (strcmp(s+1, "ufdio") == 0) { +- if (rstreq(s+1, "gzdio")) { ++ if (rstreq(s+1, "ufdio")) { + compr = NULL; -+ } else if (strcmp(s+1, "gzdio") == 0) { ++ } else if (rstreq(s+1, "gzdio")) { compr = "gzip"; #if HAVE_BZLIB_H - } else if (strcmp(s+1, "bzdio") == 0) { -@@ -402,7 +404,8 @@ rpmRC writeRPM(Header *hdrp, unsigned ch + } else if (rstreq(s+1, "bzdio")) { +@@ -398,7 +400,8 @@ rpmRC writeRPM(Header *hdrp, unsigned ch goto exit; } ++++++ brpcombress.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,8 +1,11 @@ -make brp-compress deal correctly with hardlinked man pages - ---- ./scripts/brp-compress.orig 2004-10-17 18:49:52.000000000 +0000 -+++ ./scripts/brp-compress 2005-12-15 14:03:58.000000000 +0000 -@@ -5,12 +5,38 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD +--- ./scripts/brp-compress.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./scripts/brp-compress 2010-03-25 15:11:29.000000000 +0000 +@@ -1,16 +1,43 @@ +-#!/bin/sh ++#!/bin/bash + + # If using normal root, avoid changing anything. + if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then exit 0 fi @@ -20,7 +23,6 @@ +{ + dir=$1 + b=$2 -+ type=$3 + + inode=`ls -i $b | awk '{ print $1 }'` + others=`find $dir -type f -inum $inode` @@ -28,11 +30,13 @@ + [ "$afile" != "$b" ] && rm -f $afile + done + -+ case $type in -+ Z|gz) gunzip $b ;; -+ bz2) bunzip2 $b ;; ++ case $b in ++ *.Z|*.gz) gunzip $b ;; ++ *.bz2) bunzip2 $b ;; ++ *.xz|*.lzma) unxz $b ;; + esac + ++ type=${b##*.} + for afile in $others ; do + [ "${afile%.$type}" != "${b%.$type}" ] && ln ${b%.$type} ${afile%.$type} + done @@ -41,16 +45,16 @@ for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \ ./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \ ./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \ -@@ -23,9 +49,9 @@ do +@@ -23,9 +50,9 @@ do [ "`basename $f`" = "dir" ] && continue case "$f" in -- *.Z) gunzip $f; b=`echo $f | sed -e 's/\.Z$//'`;; -- *.gz) gunzip $f; b=`echo $f | sed -e 's/\.gz$//'`;; -- *.bz2) bunzip2 $f; b=`echo $f | sed -e 's/\.bz2$//'`;; -+ *.Z) gunzip $f || check_for_hard_link $d $f Z; b=`echo $f | sed -e 's/\.Z$//'`;; -+ *.gz) gunzip $f || check_for_hard_link $d $f gz; b=`echo $f | sed -e 's/\.gz$//'`;; -+ *.bz2) bunzip2 $f || check_for_hard_link $d $f bz2; b=`echo $f | sed -e 's/\.bz2$//'`;; +- *.gz|*.Z) gunzip $f; b=`echo $f | sed -e 's/\.$gz\|Z$$//'`;; +- *.bz2) bunzip2 $f; b=`echo $f | sed -e 's/\.bz2$//'`;; +- *.xz|*.lzma) unxz $f; b=`echo $f | sed -e 's/\.$xz\|lzma$$//'`;; ++ *.gz|*.Z) gunzip $f || check_for_hard_link $d $f; b=`echo $f | sed -e 's/\.$gz\|Z$$//'`;; ++ *.bz2) bunzip2 $f || check_for_hard_link $d $f; b=`echo $f | sed -e 's/\.bz2$//'`;; ++ *.xz|*.lzma) unxz $f || check_for_hard_link $d $f; b=`echo $f | sed -e 's/\.$xz\|lzma$$//'`;; *) b=$f;; esac ++++++ build.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,25 +1,9 @@ Many changes to Makefiles/autogen and the like to make it build on SUSE systems. ---- - autogen.sh | 16 +++-- - build/Makefile.am | 2 - configure.ac | 153 ++++++++++++++++++++++++++++++++------------------- - db3/configure | 6 +- - file/src/Makefile.am | 2 - installplatform | 9 ++- - lib/Makefile.am | 2 - popt/autogen.sh | 2 - rpmdb/Makefile.am | 4 - - rpmio/Makefile.am | 10 +-- - scripts/Makefile.am | 8 ++ - 11 files changed, 132 insertions(+), 82 deletions(-) - -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -1009,6 +1009,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH=arm +--- ./configure.ac.orig 2010-03-24 16:35:40.000000000 +0000 ++++ ./configure.ac 2010-03-25 15:16:21.000000000 +0000 +@@ -1006,6 +1006,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH=arm mipsel*) RPMCANONCOLOR=0; RPMCANONARCH=mipsel ;; mips*) RPMCANONCOLOR=0; RPMCANONARCH=mips ;; m68k*) RPMCANONCOLOR=0; RPMCANONARCH=m68k ;; @@ -27,7 +11,7 @@ sh3*) RPMCANONCOLOR=0; RPMCANONARCH=sh3 ;; sh4*) RPMCANONCOLOR=0; RPMCANONARCH=sh4 ;; *) RPMCANONCOLOR=0; RPMCANONARCH=unknown ;; -@@ -1019,6 +1020,7 @@ esac +@@ -1016,6 +1017,7 @@ esac RPMCANONVENDOR="$build_vendor" case "${build_vendor}" in unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse) @@ -35,7 +19,7 @@ test -f /etc/redhat-release && RPMCANONVENDOR=redhat test -f /etc/SuSE-release && RPMCANONVENDOR=suse test -f /etc/pld-release && RPMCANONVENDOR=pld -@@ -1031,6 +1033,9 @@ unknown|pc|ibm|redhat|pld|mandrake|conec +@@ -1028,6 +1030,9 @@ unknown|pc|ibm|redhat|pld|mandrake|conec esac RPMCANONOS="$host_os_noversion" RPMCANONGNU="$host_os_gnu" @@ -45,28 +29,23 @@ AC_SUBST(RPMCANONCOLOR) AC_SUBST(RPMCANONARCH) AC_SUBST(RPMCANONVENDOR) -Index: db3/configure -=================================================================== ---- db3/configure.orig -+++ db3/configure +--- ./db3/configure.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./db3/configure 2010-03-25 15:17:41.000000000 +0000 @@ -10,9 +10,9 @@ rm -f config.cache # XXX edit CFLAGS= ... out of invocation args ??? ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`" -CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \ -- --enable-shared --enable-static --enable-rpc \ -- --with-uniquename=_rpmdb --srcdir=$db_dist +CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \ -+ --enable-shared --enable-static --enable-rpc \ + --enable-shared --enable-static \ +- --with-uniquename=_rpmdb --srcdir=$db_dist + --with-uniquename=_rpmdb --srcdir=$db_dist $ARGS mv Makefile Makefile.orig cat Makefile.orig | sed -e '/^install[:-]/c\ -Index: installplatform -=================================================================== ---- installplatform.orig -+++ installplatform -@@ -54,9 +54,9 @@ for SUBST in $SUBSTS ; do +--- ./installplatform.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./installplatform 2010-03-25 15:16:21.000000000 +0000 +@@ -47,9 +47,9 @@ for SUBST in $SUBSTS ; do ARCH_INSTALL_POST='%{nil}' case "${ARCH}-${OS}" in sparc64*-linux) LIB=lib64 ;; @@ -79,7 +58,7 @@ *) LIB=lib;; esac -@@ -136,6 +136,9 @@ for SUBST in $SUBSTS ; do +@@ -129,6 +129,9 @@ for SUBST in $SUBSTS ; do apple) VENDORSED='-e s,^@apple@,,' ;; ++++++ dbfsync.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,10 +1,8 @@ Support a database-local fsync setting. Needs berkeley db patch. -Index: lib/backend/db3.c -=================================================================== ---- lib/backend/db3.c.orig -+++ lib/backend/db3.c -@@ -191,10 +191,12 @@ static int db_fini(dbiIndex dbi, const c +--- ./lib/backend/db3.c.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/backend/db3.c 2010-03-25 14:35:39.000000000 +0000 +@@ -62,10 +62,12 @@ static int db_fini(dbiIndex dbi, const c return rc; } @@ -17,9 +15,9 @@ #if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 5) /* -@@ -357,10 +359,12 @@ static int db_init(dbiIndex dbi, const c - /* dbenv->set_rep_transport(???) */ - /* dbenv->set_rep_limit(???) */ +@@ -168,10 +170,12 @@ static int db_init(dbiIndex dbi, const c + xx = cvtdberr(dbi, "dbenv->set_cachesize", xx, _debug); + } +#if 0 if (dbi->dbi_no_fsync) { @@ -30,11 +28,9 @@ if (dbi->dbi_shmkey) { xx = dbenv->set_shm_key(dbenv, dbi->dbi_shmkey); -Index: lib/backend/dbconfig.c -=================================================================== ---- lib/backend/dbconfig.c.orig -+++ lib/backend/dbconfig.c -@@ -94,6 +94,8 @@ struct poptOption rdbOptions[] = { +--- ./lib/backend/dbconfig.c.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/backend/dbconfig.c 2010-03-25 14:35:39.000000000 +0000 +@@ -72,6 +72,8 @@ static const struct poptOption rdbOption NULL, NULL }, { "fcntl_locking",0,POPT_BIT_SET, &db3dbi.dbi_oflags, DB_FCNTL_LOCKING, NULL, NULL }, @@ -43,7 +39,7 @@ { "btree", 0,POPT_ARG_VAL, &db3dbi.dbi_type, DB_BTREE, NULL, NULL }, -@@ -140,8 +142,6 @@ struct poptOption rdbOptions[] = { +@@ -101,8 +103,6 @@ static const struct poptOption rdbOption NULL, NULL }, { "usedbenv", 0,POPT_ARG_NONE, &db3dbi.dbi_use_dbenv, 0, NULL, NULL }, ++++++ debugsubpkg.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,7 +1,5 @@ -Index: build/files.c -=================================================================== ---- build/files.c.orig -+++ build/files.c +--- ./build/files.c.orig 2010-03-25 15:18:05.000000000 +0000 ++++ ./build/files.c 2010-03-25 15:21:26.000000000 +0000 @@ -17,6 +17,10 @@ #include <rpm/rpmfileutil.h> /* rpmDoDigest() */ #include <rpm/rpmlog.h> @@ -13,7 +11,7 @@ #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ #include "rpmio/base64.h" #include "rpmio/fts.h" -@@ -2220,12 +2224,136 @@ exit: +@@ -2230,12 +2234,136 @@ exit: return rc; } @@ -150,9 +148,9 @@ genSourceRpmName(spec); for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) { -@@ -2238,8 +2366,109 @@ int processBinaryFiles(rpmSpec spec, int - (void) headerNEVRA(pkg->header, &n, NULL, &v, &r, &a); - rpmlog(RPMLOG_NOTICE, _("Processing files: %s-%s-%s.%s\n"), n, v, r, a); +@@ -2250,8 +2378,110 @@ int processBinaryFiles(rpmSpec spec, int + rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr); + free(nvr); - if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test)) != RPMRC_OK || - (rc = rpmfcGenerateDepends(spec, pkg)) != RPMRC_OK) @@ -162,6 +160,7 @@ + /* BEGIN DEBUGPKG */ +#if HAVE_GELF_H && HAVE_LIBELF + elf_version(EV_CURRENT); ++ a = headerGetString(pkg->header, RPMTAG_ARCH); + if (strcmp(a, "noarch") != 0 && strcmp(a, "src") != 0 && strcmp(a, "nosrc") != 0) + { + Package dbg; @@ -261,11 +260,9 @@ + if ((rc = rpmfcGenerateDepends(spec, pkg)) != RPMRC_OK) goto exit; - if (strcmp(a, "noarch") == 0 && headerGetColor(pkg->header) != 0) { -Index: macros.in -=================================================================== ---- macros.in.orig -+++ macros.in + a = headerGetString(pkg->header, RPMTAG_ARCH); +--- ./macros.in.orig 2010-03-25 15:21:20.000000000 +0000 ++++ ./macros.in 2010-03-25 15:21:26.000000000 +0000 @@ -176,24 +176,10 @@ # Template for debug information sub-package. %debug_package \ @@ -291,11 +288,9 @@ %description debugsource\ This package provides debug sources for package %{name}.\ Debug sources are useful when developing applications that use this\ -Index: scripts/find-debuginfo.sh -=================================================================== ---- scripts/find-debuginfo.sh.orig -+++ scripts/find-debuginfo.sh -@@ -274,19 +274,11 @@ while read nlinks inum f; do +--- ./scripts/find-debuginfo.sh.orig 2010-03-25 15:19:04.000000000 +0000 ++++ ./scripts/find-debuginfo.sh 2010-03-25 15:21:26.000000000 +0000 +@@ -275,19 +275,11 @@ while read nlinks inum f; do fi done || exit ++++++ defclean.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,10 +1,8 @@ -Index: build/parseSpec.c -=================================================================== ---- build/parseSpec.c.orig -+++ build/parseSpec.c -@@ -569,6 +569,13 @@ int parseSpec(rpmts ts, const char *spec +--- ./build/parseSpec.c.orig 2010-03-25 15:19:16.000000000 +0000 ++++ ./build/parseSpec.c 2010-03-25 15:45:25.000000000 +0000 +@@ -562,6 +562,13 @@ int parseSpec(rpmts ts, const char *spec + free(body); } - /* LCL: parsePart is modified @*/ + if (spec->clean == NULL) { + char *body = rpmExpand("%{?buildroot: %{__rm} -rf %{buildroot}}", NULL); ++++++ diskspace.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -2,24 +2,23 @@ friendly. Probably a bad idea, as it changes the semantics. Instead, the messages should be changed. -Index: lib/rpmts.c -=================================================================== ---- lib/rpmts.c.orig -+++ lib/rpmts.c -@@ -924,14 +924,14 @@ void rpmtsCheckDSIProblems(const rpmts t - rpmpsAppend(ps, RPMPROB_DISKSPACE, +--- ./lib/transaction.c.orig 2010-03-25 14:37:50.000000000 +0000 ++++ ./lib/transaction.c 2010-03-25 14:38:27.000000000 +0000 +@@ -212,7 +212,7 @@ static void rpmtsCheckDSIProblems(const + rpmpsAppend(ps, RPMPROB_DISKSPACE, rpmteNEVRA(te), rpmteKey(te), ts->filesystems[i], NULL, NULL, -- (adj_fs_blocks(dsi->bneeded) - dsi->bavail) * dsi->bsize); -+ (adj_fs_blocks(dsi->bneeded)) * dsi->bsize); +- (adj_fs_blocks(dsi->bneeded) - dsi->bavail) * dsi->bsize); ++ (adj_fs_blocks(dsi->bneeded)) * dsi->bsize); + dsi->obneeded = dsi->bneeded; + } } - - if (dsi->iavail >= 0 && adj_fs_blocks(dsi->ineeded) > dsi->iavail) { - rpmpsAppend(ps, RPMPROB_DISKNODES, +@@ -222,7 +222,7 @@ static void rpmtsCheckDSIProblems(const + rpmpsAppend(ps, RPMPROB_DISKNODES, rpmteNEVRA(te), rpmteKey(te), ts->filesystems[i], NULL, NULL, -- (adj_fs_blocks(dsi->ineeded) - dsi->iavail)); -+ (adj_fs_blocks(dsi->ineeded))); +- (adj_fs_blocks(dsi->ineeded) - dsi->iavail)); ++ (adj_fs_blocks(dsi->ineeded))); + dsi->oineeded = dsi->ineeded; + } } - } - ps = rpmpsFree(ps); ++++++ disttag-macro.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,22 +1,18 @@ -Index: build/parsePreamble.c -=================================================================== ---- build/parsePreamble.c.orig -+++ build/parsePreamble.c -@@ -311,6 +311,7 @@ static struct optionalTag { +--- ./build/parsePreamble.c.orig 2010-03-25 14:56:24.000000000 +0000 ++++ ./build/parsePreamble.c 2010-03-25 15:20:35.000000000 +0000 +@@ -312,6 +312,7 @@ static struct optionalTag { { RPMTAG_PACKAGER, "%{packager}" }, { RPMTAG_DISTRIBUTION, "%{distribution}" }, { RPMTAG_DISTURL, "%{disturl}" }, + { RPMTAG_DISTTAG, "%{disttag}" }, + { RPMTAG_BUGURL, "%{bugurl}" }, { -1, NULL } }; - -Index: macros.in -=================================================================== ---- macros.in.orig -+++ macros.in -@@ -276,6 +276,16 @@ package or when debugging this package.\ +--- ./macros.in.orig 2010-03-25 15:18:50.000000000 +0000 ++++ ./macros.in 2010-03-25 15:19:25.000000000 +0000 +@@ -279,6 +279,16 @@ package or when debugging this package.\ # - #%disturl + #%bugurl +# Configurable distribution tag, same as Disttag: tag in a specfile. +# The tag will be used to supply reliable information to tools like ++++++ findksyms.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,14 +1,25 @@ SUSE specific kernel provides/requires scripts ---- - scripts/find-provides.ksyms | 41 +++++++++++++++++++++++++++++++ - scripts/find-requires.ksyms | 57 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 98 insertions(+) - -Index: scripts/find-provides.ksyms -=================================================================== ---- /dev/null -+++ scripts/find-provides.ksyms +--- ./scripts/Makefile.am.orig 2010-03-25 16:39:30.000000000 +0000 ++++ ./scripts/Makefile.am 2010-03-25 16:39:56.000000000 +0000 +@@ -18,6 +18,7 @@ EXTRA_DIST = \ + rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ + tcl.req tgpg vpkg-provides.sh \ + find-requires.php find-provides.php \ ++ find-requires.ksyms find-provides.ksyms \ + find-php-provides find-php-requires \ + mono-find-requires mono-find-provides \ + ocaml-find-requires.sh ocaml-find-provides.sh \ +@@ -34,6 +35,7 @@ rpmconfig_SCRIPTS = \ + check-buildroot check-rpaths check-rpaths-worker \ + find-lang.sh \ + perl.prov perl.req perldeps.pl pythondeps.sh osgideps.pl \ ++ find-requires.ksyms find-provides.ksyms \ + mono-find-requires mono-find-provides \ + pkgconfigdeps.sh libtooldeps.sh \ + ocaml-find-requires.sh ocaml-find-provides.sh \ +--- ./scripts/find-provides.ksyms.orig 2010-03-25 16:39:56.000000000 +0000 ++++ ./scripts/find-provides.ksyms 2010-03-25 16:39:56.000000000 +0000 @@ -0,0 +1,41 @@ +#! /bin/sh + @@ -51,10 +62,8 @@ + | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p" +done \ +| sort -u -Index: scripts/find-requires.ksyms -=================================================================== ---- /dev/null -+++ scripts/find-requires.ksyms +--- ./scripts/find-requires.ksyms.orig 2010-03-25 16:39:56.000000000 +0000 ++++ ./scripts/find-requires.ksyms 2010-03-25 16:39:56.000000000 +0000 @@ -0,0 +1,57 @@ +#! /bin/bash + @@ -113,23 +122,3 @@ + { print "ksym(" flavor ":" arr[3] ") = " arr[2] } + ' +fi -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig -+++ scripts/Makefile.am -@@ -19,6 +19,7 @@ EXTRA_DIST = \ - tcl.req tgpg u_pkg.sh \ - vpkg-provides.sh vpkg-provides2.sh \ - find-requires.php find-provides.php \ -+ find-requires.ksyms find-provides.ksyms \ - find-php-provides find-php-requires \ - mono-find-requires mono-find-provides \ - pkgconfigdeps.sh libtooldeps.sh -@@ -33,6 +34,7 @@ rpmconfig_SCRIPTS = \ - check-buildroot check-rpaths check-rpaths-worker \ - find-lang.sh \ - perl.prov perl.req perldeps.pl pythondeps.sh osgideps.pl \ -+ find-requires.ksyms find-provides.ksyms \ - mono-find-requires mono-find-provides \ - pkgconfigdeps.sh libtooldeps.sh \ - rpmdb_loadcvt rpmdiff rpm2cpio.sh tcl.req tgpg ++++++ lazystatfs.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,10 +1,51 @@ -Index: lib/rpmts.c -=================================================================== ---- lib/rpmts.c.orig -+++ lib/rpmts.c -@@ -779,83 +779,102 @@ rpmdb rpmtsGetRdb(rpmts ts) +--- ./configure.ac.orig 2010-03-25 15:16:21.000000000 +0000 ++++ ./configure.ac 2010-03-25 15:27:47.000000000 +0000 +@@ -510,25 +510,25 @@ dnl + found_struct_statfs=no + + if test X$found_struct_statfs = Xno ; then +-dnl Solaris 2.6+ wants to use statvfs ++dnl first try including sys/vfs.h + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif +-#include <sys/statvfs.h> ]], [[struct statvfs sfs;]])],[AC_MSG_RESULT(in sys/statvfs.h) +- AC_DEFINE(STATFS_IN_SYS_STATVFS, 1, +- [statfs in <sys/statvfs.h> (for solaris 2.6+ systems)]) ++#include <sys/vfs.h> ]], [[struct statfs sfs;]])],[AC_MSG_RESULT(in sys/vfs.h) ++ AC_DEFINE(STATFS_IN_SYS_VFS, 1, [statfs in <sys/vfs.h> (for linux systems)]) + found_struct_statfs=yes],[]) + fi + + if test X$found_struct_statfs = Xno ; then +-dnl first try including sys/vfs.h ++dnl Solaris 2.6+ wants to use statvfs + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif +-#include <sys/vfs.h> ]], [[struct statfs sfs;]])],[AC_MSG_RESULT(in sys/vfs.h) +- AC_DEFINE(STATFS_IN_SYS_VFS, 1, [statfs in <sys/vfs.h> (for linux systems)]) ++#include <sys/statvfs.h> ]], [[struct statvfs sfs;]])],[AC_MSG_RESULT(in sys/statvfs.h) ++ AC_DEFINE(STATFS_IN_SYS_STATVFS, 1, ++ [statfs in <sys/statvfs.h> (for solaris 2.6+ systems)]) + found_struct_statfs=yes],[]) + fi + +--- ./lib/transaction.c.orig 2010-03-25 15:14:38.000000000 +0000 ++++ ./lib/transaction.c 2010-03-25 15:44:25.000000000 +0000 +@@ -45,6 +45,7 @@ + #include "debug.h" - int rpmtsInitDSI(const rpmts ts) + struct diskspaceInfo_s { ++ const char *mntPoint; /*!< File system mount point */ + dev_t dev; /*!< File system device number. */ + int64_t bneeded; /*!< No. of blocks needed. */ + int64_t ineeded; /*!< No. of inodes needed. */ +@@ -61,83 +62,78 @@ struct diskspaceInfo_s { + + static int rpmtsInitDSI(const rpmts ts) { - rpmDiskSpaceInfo dsi; - struct stat sb; @@ -13,7 +54,7 @@ - if (rpmtsFilterFlags(ts) & RPMPROB_FILTER_DISKSPACE) return 0; -- + - rpmlog(RPMLOG_DEBUG, "mounted filesystems:\n"); - rpmlog(RPMLOG_DEBUG, - " i dev bsize bavail iavail mount point\n"); @@ -45,7 +86,7 @@ - rc = statvfs(ts->filesystems[i], &sfb); + struct statvfs sfb; + memset(&sfb, 0, sizeof(sfb)); -+ rc = statvfs(dirName, &sfb); ++ rc = statvfs(ts->filesystems[i], &sfb); #else - struct statfs sfb; - memset(&sfb, 0, sizeof(sfb)); @@ -66,35 +107,39 @@ #endif - if (rc) - break; -- ++ if (rc) ++ return NULL; + - rc = stat(ts->filesystems[i], &sb); - if (rc) - break; - dsi->dev = sb.st_dev; ++ rc = stat(dirName, &sb); + if (rc) + return NULL; ++ if (sb.st_dev != dev) ++ return NULL; - dsi->bsize = sfb.f_bsize; - dsi->bneeded = 0; - dsi->ineeded = 0; -+ rc = stat(dirName, &sb); -+ if (rc) -+ return NULL; -+ if (sb.st_dev != dev) -+ return NULL; -+ + ts->dsi = xrealloc(ts->dsi, (count + 2) * sizeof(*ts->dsi)); + dsi = ts->dsi + count; + memset(dsi, 0, 2 * sizeof(*dsi)); -+ dsi->dev = dev; ++ ++ dsi->dev = sb.st_dev; + dsi->bsize = sfb.f_bsize; + if (!dsi->bsize) + dsi->bsize = 512; /* we need a bsize */ + dsi->bneeded = 0; + dsi->ineeded = 0; #ifdef STATFS_HAS_F_BAVAIL -- dsi->bavail = sfb.f_bavail; +- dsi->bavail = (sfb.f_flag & ST_RDONLY) ? 0 : sfb.f_bavail; ++# ifdef ST_RDONLY ++ dsi->bavail = (sfb.f_flag & ST_RDONLY) ? 0 : sfb.f_bavail; ++# else + dsi->bavail = sfb.f_bavail; ++# endif #else /* FIXME: the statfs struct doesn't have a member to tell how many blocks are * available for non-superusers. f_blocks - f_bfree is probably too big, but @@ -112,14 +157,37 @@ - i, (unsigned) dsi->dev, dsi->bsize, - dsi->bavail, dsi->iavail, - ts->filesystems[i]); +- } +- return rc; + /* XXX Avoid FAT and other file systems that have not inodes. */ + /* XXX assigning negative value to unsigned type */ + dsi->iavail = !(sfb.f_ffree == 0 && sfb.f_files == 0) + ? sfb.f_ffree : -1; -+ + return dsi; -+} -+ + } + +-static void rpmtsUpdateDSI(const rpmts ts, dev_t dev, ++static void rpmtsUpdateDSI(const rpmts ts, dev_t dev, const char *dirName, + rpm_loff_t fileSize, rpm_loff_t prevSize, rpm_loff_t fixupSize, + rpmFileAction action) + { +@@ -148,8 +140,10 @@ static void rpmtsUpdateDSI(const rpmts t + if (dsi) { + while (dsi->bsize && dsi->dev != dev) + dsi++; +- if (dsi->bsize == 0) +- dsi = NULL; ++ if (dsi->bsize == 0) { ++ /* create new entry */ ++ dsi = rpmtsCreateDSI(ts, dev, dirName, dsi - ts->dsi); ++ } + } + if (dsi == NULL) + return; +@@ -187,31 +181,58 @@ static void rpmtsUpdateDSI(const rpmts t + dsi->bneeded -= BLOCK_ROUND(fixupSize, dsi->bsize); + } + +static void rpmtsFindDSIMount(const rpmts ts, rpmDiskSpaceInfo dsi) +{ + int i; @@ -142,33 +210,15 @@ + if (i == ts->filesystemCount) { + /* file system not found, create something to display */ + dsi->mntPoint = xmalloc(20); -+ sprintf(dsi->mntPoint, "dev 0x%08x", (unsigned)dsi->dev); ++ sprintf((char *)dsi->mntPoint, "dev 0x%08x", (unsigned)dsi->dev); + } + if (rpmtsChrootDone(ts)) { + chroot(ts->rootDir); - } -- return rc; - } - --void rpmtsUpdateDSI(const rpmts ts, dev_t dev, -+void rpmtsUpdateDSI(const rpmts ts, dev_t dev, const char *dirName, - rpm_loff_t fileSize, rpm_loff_t prevSize, rpm_loff_t fixupSize, - rpmFileAction action) ++ } ++} ++ + static void rpmtsCheckDSIProblems(const rpmts ts, const rpmte te) { -@@ -866,8 +885,10 @@ void rpmtsUpdateDSI(const rpmts ts, dev_ - if (dsi) { - while (dsi->bsize && dsi->dev != dev) - dsi++; -- if (dsi->bsize == 0) -- dsi = NULL; -+ if (dsi->bsize == 0) { -+ /* create new entry */ -+ dsi = rpmtsCreateDSI(ts, dev, dirName, dsi - ts->dsi); -+ } - } - if (dsi == NULL) - return; -@@ -910,32 +931,32 @@ void rpmtsCheckDSIProblems(const rpmts t rpmDiskSpaceInfo dsi; rpmps ps; int fc; @@ -190,55 +240,30 @@ + for (; dsi->bsize; dsi++) { if (dsi->bavail >= 0 && adj_fs_blocks(dsi->bneeded) > dsi->bavail) { -+ if (!dsi->mntPoint) -+ rpmtsFindDSIMount(ts, dsi); - rpmpsAppend(ps, RPMPROB_DISKSPACE, + if (dsi->bneeded != dsi->obneeded) { ++ if (!dsi->mntPoint) ++ rpmtsFindDSIMount(ts, dsi); + rpmpsAppend(ps, RPMPROB_DISKSPACE, rpmteNEVRA(te), rpmteKey(te), - ts->filesystems[i], NULL, NULL, + dsi->mntPoint, NULL, NULL, - (adj_fs_blocks(dsi->bneeded)) * dsi->bsize); - } + (adj_fs_blocks(dsi->bneeded)) * dsi->bsize); + dsi->obneeded = dsi->bneeded; + } +@@ -219,9 +240,11 @@ static void rpmtsCheckDSIProblems(const if (dsi->iavail >= 0 && adj_fs_blocks(dsi->ineeded) > dsi->iavail) { -+ if (!dsi->mntPoint) -+ rpmtsFindDSIMount(ts, dsi); - rpmpsAppend(ps, RPMPROB_DISKNODES, + if (dsi->ineeded != dsi->oineeded) { ++ if (!dsi->mntPoint) ++ rpmtsFindDSIMount(ts, dsi); + rpmpsAppend(ps, RPMPROB_DISKNODES, rpmteNEVRA(te), rpmteKey(te), - ts->filesystems[i], NULL, NULL, + dsi->mntPoint, NULL, NULL, - (adj_fs_blocks(dsi->ineeded))); - } - } -Index: lib/rpmts.h -=================================================================== ---- lib/rpmts.h.orig -+++ lib/rpmts.h -@@ -485,7 +485,7 @@ int rpmtsSuspendResumeDBLock(rpmts ts, i - * @param fixupSize long size difference - * @param action file disposition - */ --void rpmtsUpdateDSI(const rpmts ts, dev_t dev, -+void rpmtsUpdateDSI(const rpmts ts, dev_t dev, const char *dirName, - rpm_loff_t fileSize, rpm_loff_t prevSize, rpm_loff_t fixupSize, - rpmFileAction action); - -Index: lib/rpmts_internal.h -=================================================================== ---- lib/rpmts_internal.h.orig -+++ lib/rpmts_internal.h -@@ -14,6 +14,7 @@ typedef struct diskspaceInfo_s * rpmDisk - /** \ingroup rpmts - */ - struct diskspaceInfo_s { -+ const char *mntPoint; /*!< File system mount point */ - dev_t dev; /*!< File system device number. */ - int64_t bneeded; /*!< No. of blocks needed. */ - int64_t ineeded; /*!< No. of inodes needed. */ -Index: lib/transaction.c -=================================================================== ---- lib/transaction.c.orig -+++ lib/transaction.c -@@ -343,7 +343,7 @@ assert(otherFi != NULL); + (adj_fs_blocks(dsi->ineeded))); + dsi->oineeded = dsi->ineeded; + } +@@ -543,7 +566,7 @@ assert(otherFi != NULL); } /* Update disk space info for a file. */ @@ -247,40 +272,3 @@ rpmfiFReplacedSize(fi), fixupSize, rpmfsGetAction(fs, i)); } -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -511,25 +511,25 @@ dnl - found_struct_statfs=no - - if test X$found_struct_statfs = Xno ; then --dnl Solaris 2.6+ wants to use statvfs -+dnl first try including sys/vfs.h - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif --#include <sys/statvfs.h> ]], [[struct statvfs sfs;]])],[AC_MSG_RESULT(in sys/statvfs.h) -- AC_DEFINE(STATFS_IN_SYS_STATVFS, 1, -- [statfs in <sys/statvfs.h> (for solaris 2.6+ systems)]) -+#include <sys/vfs.h> ]], [[struct statfs sfs;]])],[AC_MSG_RESULT(in sys/vfs.h) -+ AC_DEFINE(STATFS_IN_SYS_VFS, 1, [statfs in <sys/vfs.h> (for linux systems)]) - found_struct_statfs=yes],[]) - fi - - if test X$found_struct_statfs = Xno ; then --dnl first try including sys/vfs.h -+dnl Solaris 2.6+ wants to use statvfs - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif --#include <sys/vfs.h> ]], [[struct statfs sfs;]])],[AC_MSG_RESULT(in sys/vfs.h) -- AC_DEFINE(STATFS_IN_SYS_VFS, 1, [statfs in <sys/vfs.h> (for linux systems)]) -+#include <sys/statvfs.h> ]], [[struct statvfs sfs;]])],[AC_MSG_RESULT(in sys/statvfs.h) -+ AC_DEFINE(STATFS_IN_SYS_STATVFS, 1, -+ [statfs in <sys/statvfs.h> (for solaris 2.6+ systems)]) - found_struct_statfs=yes],[]) - fi - ++++++ localetag.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,10 +1,5 @@ -Convert changelog and i18n header elements to current locale. -[#43347], rh#140050 - -Index: lib/tagexts.c -=================================================================== ---- lib/tagexts.c.orig -+++ lib/tagexts.c +--- ./lib/tagexts.c.orig 2010-01-08 08:14:37.000000000 +0000 ++++ ./lib/tagexts.c 2010-03-24 16:46:03.000000000 +0000 @@ -2,6 +2,7 @@ * \file lib/formats.c */ @@ -13,7 +8,7 @@ #include "system.h" #include <rpm/rpmtypes.h> -@@ -156,6 +157,114 @@ exit: +@@ -157,6 +158,114 @@ exit: return rc; } @@ -128,31 +123,27 @@ /** * Retrieve mounted file system paths. * @param h header -@@ -534,9 +643,43 @@ static int i18nTag(Header h, rpmTag tag, +@@ -533,10 +642,41 @@ static int i18nTag(Header h, rpmTag tag, dstring = _free(dstring); - rc = headerGet(h, tag, td, HEADERGET_DEFAULT); + rc = headerGet(h, tag, td, HEADERGET_ALLOC); + if (rc && td->data) { -+ td->data = xstrdup(td->data); + td->data = strtolocale(td->data); -+ td->flags = RPMTD_ALLOCED; + } -+ return rc; -+} -+ -+/** + return rc; + } + + /** + * Retrieve text and convert to locale. + */ +static int localeTag(Header h, rpmTag tag, rpmtd td) +{ + int rc; -+ rc = headerGet(h, tag, td, HEADERGET_DEFAULT); ++ rc = headerGet(h, tag, td, HEADERGET_ALLOC); + if (!rc) + return 0; + if (td->type == RPM_STRING_TYPE) { -+ td->data = xstrdup(td->data); + td->data = strtolocale(td->data); -+ td->flags = RPMTD_ALLOCED; + td->count = 1; + } else if (td->type == RPM_STRING_ARRAY_TYPE) { + char **arr; @@ -162,18 +153,20 @@ + arr[i] = xstrdup(((char **)td->data)[i]); + arr[i] = strtolocale(arr[i]); + } ++ _free(td->data); + td->data = arr; + td->flags = RPMTD_ALLOCED | RPMTD_PTR_ALLOCED; + } - return rc; - } - ++ return rc; ++} + - /** ++ ++/** * Retrieve summary text. * @param h header -@@ -559,6 +702,16 @@ static int descriptionTag(Header h, rpmt - return i18nTag(h, RPMTAG_DESCRIPTION, td); + * @retval td tag data container +@@ -558,6 +698,16 @@ static int descriptionTag(Header h, rpmt + return i18nTag(h, RPMTAG_DESCRIPTION, td, hgflags); } +static int changelognameTag(Header h, rpmtd td) @@ -189,12 +182,12 @@ /** * Retrieve group text. * @param h header -@@ -663,6 +816,8 @@ static const struct headerTagFunc_s rpmH +@@ -791,6 +941,8 @@ static const struct headerTagFunc_s rpmH { RPMTAG_LONGARCHIVESIZE, longarchivesizeTag }, { RPMTAG_LONGSIZE, longsizeTag }, { RPMTAG_LONGSIGSIZE, longsigsizeTag }, + { RPMTAG_CHANGELOGNAME, changelognameTag }, + { RPMTAG_CHANGELOGTEXT, changelogtextTag }, - { 0, NULL } - }; - + { RPMTAG_DBINSTANCE, dbinstanceTag }, + { RPMTAG_EVR, evrTag }, + { RPMTAG_NVR, nvrTag }, ++++++ luaroot.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,8 +1,6 @@ -Index: lib/psm.c -=================================================================== ---- lib/psm.c.orig -+++ lib/psm.c -@@ -441,6 +441,8 @@ static rpmRC runLuaScript(rpmpsm psm, He +--- ./lib/psm.c.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/psm.c 2010-03-25 14:42:52.000000000 +0000 +@@ -455,6 +455,8 @@ static rpmRC runLuaScript(rpmpsm psm, He #ifdef WITH_LUA char *sname = NULL; int rootFd = -1; @@ -11,16 +9,10 @@ int xx; rpmlua lua = NULL; /* Global state. */ rpmluav var; -@@ -449,16 +451,21 @@ static rpmRC runLuaScript(rpmpsm psm, He +@@ -463,6 +465,22 @@ static rpmRC runLuaScript(rpmpsm psm, He rpmlog(RPMLOG_DEBUG, "%s: %s running <lua> scriptlet.\n", psm->stepName, sname); -- if (!rpmtsChrootDone(ts)) { -- const char *rootDir = rpmtsRootDir(ts); -- xx = chdir("/"); -- rootFd = open(".", O_RDONLY, 0); -- if (rootFd >= 0) { -- if (rootDir != NULL && strcmp(rootDir, "/") && *rootDir == '/') + chroot_done = rpmtsChrootDone(ts); + rootDir = rpmtsRootDir(ts); + if (!chroot_done) { @@ -28,26 +20,26 @@ + xx = chdir("/"); + rootFd = open(".", O_RDONLY, 0); + if (rootFd >= 0) { - xx = chroot(rootDir); -- xx = rpmtsSetChrootDone(ts, 1); ++ xx = chroot(rootDir); + xx = rpmtsSetChrootDone(ts, 1); + } - } ++ } + } else { + rootFd = open(".", O_RDONLY, 0); - } ++ } + xx = chdir("/"); - - /* Create arg variable */ - rpmluaPushTable(lua, "arg"); -@@ -491,12 +498,17 @@ static rpmRC runLuaScript(rpmpsm psm, He ++ + if (!rpmtsChrootDone(ts)) { + const char *rootDir = rpmtsRootDir(ts); + xx = chdir("/"); +@@ -505,12 +523,17 @@ static rpmRC runLuaScript(rpmpsm psm, He rpmluaDelVar(lua, "arg"); if (rootFd >= 0) { - const char *rootDir = rpmtsRootDir(ts); xx = fchdir(rootFd); xx = close(rootFd); -- if (rootDir != NULL && strcmp(rootDir, "/") && *rootDir == '/') +- if (rootDir != NULL && !rstreq(rootDir, "/") && *rootDir == '/') + if (!chroot_done) { xx = chroot("."); - xx = rpmtsSetChrootDone(ts, 0); ++++++ macrosin.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,9 +1,5 @@ -SUSE specific macro changes. - -Index: macros.in -=================================================================== ---- macros.in.orig -+++ macros.in +--- ./macros.in.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./macros.in 2010-03-25 15:13:43.000000000 +0000 @@ -175,22 +175,22 @@ # Template for debug information sub-package. @@ -33,7 +29,7 @@ # The path to the gzip executable (legacy, use %{__gzip} instead). %_gzipbin %{__gzip} -@@ -233,7 +233,7 @@ package or when debugging this package.\ +@@ -230,7 +230,7 @@ package or when debugging this package.\ %_tmppath %{_var}/tmp # Path to top of build area. @@ -42,7 +38,7 @@ # The path to the unzip executable (legacy, use %{__unzip} instead). %_unzipbin %{__unzip} -@@ -330,7 +330,7 @@ package or when debugging this package.\ +@@ -333,7 +333,7 @@ package or when debugging this package.\ # "w7.lzdio" lzma-alone level 7, lzma's default # #%_source_payload w9.gzdio @@ -51,7 +47,7 @@ # Algorithm to use for generating file checksum digests on build. # If not specified or 0, MD5 is used. -@@ -420,7 +420,7 @@ package or when debugging this package.\ +@@ -417,7 +417,7 @@ package or when debugging this package.\ # # Use internal dependency generator rather than external helpers? @@ -60,7 +56,7 @@ # # Filter GLIBC_PRIVATE Provides: and Requires: -@@ -466,16 +466,22 @@ print (t)\ +@@ -463,16 +463,22 @@ print (t)\ # Undefined, missing or %{nil} will use package content (if available). %_verify_file_context_path %{__file_context_path} @@ -84,8 +80,8 @@ +#%__find_enhances ??? # - # Path to scripts to autogenerate per-interpreter package dependencies, -@@ -638,15 +644,15 @@ print (t)\ + # Path to scripts to autogenerate per-interpreter package dependencies. +@@ -644,15 +650,15 @@ print (t)\ %_dbi_config_Packages %{_dbi_htconfig} lockdbfd # "Depends" is a per-transaction cache of known dependency resolutions. @@ -108,7 +104,7 @@ # XXX legacy configuration. # Choose db interface: -@@ -1008,7 +1014,7 @@ print (t)\ +@@ -991,7 +997,7 @@ print (t)\ %_build_vendor %{_host_vendor} %_build_os %{_host_os} %_host @host@ @@ -117,9 +113,9 @@ %_host_cpu @host_cpu@ %_host_vendor @host_vendor@ %_host_os @host_os@ -@@ -1168,6 +1174,181 @@ done \ - %perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib) - %perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib) +@@ -1154,6 +1160,181 @@ done \ + %python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") + %python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])") +# More useful perl macros (from Raul Dias <rsd(a)swi.com.br>) +# @@ -299,7 +295,7 @@ #------------------------------------------------------------------------------ # arch macro for all Intel i?86 compatibile processors # (Note: This macro (and it's analogues) will probably be obsoleted when -@@ -1178,7 +1359,9 @@ done \ +@@ -1164,7 +1345,9 @@ done \ #------------------------------------------------------------------------------ # arch macro for all supported ARM processors @@ -310,7 +306,7 @@ #------------------------------------------------------------------------------ # arch macro for all supported Sparc processors -@@ -1207,3 +1390,26 @@ done \ +@@ -1197,3 +1380,26 @@ done \ # \endverbatim #*/ ++++++ missingok.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,10 +1,6 @@ -Obey MISSINGOK flag for dependencies. Backport from rpm-4.4.7. - -Index: lib/depends.c -=================================================================== ---- lib/depends.c.orig -+++ lib/depends.c -@@ -518,8 +518,13 @@ retry: +--- ./lib/depends.c.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/depends.c 2010-03-24 16:47:28.000000000 +0000 +@@ -450,8 +450,13 @@ retry: } unsatisfied: @@ -19,20 +15,9 @@ + } exit: - /* -@@ -827,6 +832,8 @@ static inline const char * identifyDepen - return "Requires(postun):"; - if (f & RPMSENSE_SCRIPT_VERIFY) - return "Requires(verify):"; -+ if (f & RPMSENSE_MISSINGOK) -+ return "Requires(hint):"; - if (f & RPMSENSE_FIND_REQUIRES) - return "Requires(auto):"; - return "Requires:"; -Index: lib/rpmds.h -=================================================================== ---- lib/rpmds.h.orig -+++ lib/rpmds.h + if (cacheThis) { +--- ./lib/rpmds.h.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/rpmds.h 2010-03-24 16:47:28.000000000 +0000 @@ -73,6 +73,7 @@ typedef enum rpmsenseFlags_e { RPMSENSE_SCRIPT_POSTUN | \ RPMSENSE_SCRIPT_VERIFY | \ ++++++ modemuncher.diff ++++++ --- luaext/modemuncher.c.orig 2010-03-26 09:43:45.000000000 +0000 +++ luaext/modemuncher.c 2010-03-26 09:44:54.000000000 +0000 @@ -245,11 +245,11 @@ printf("modemuncher: doneflag = %u\n", d if (ch_mode) switch (op) { case '+': - *mode = *mode |= ch_mode & affected_bits; + *mode |= ch_mode & affected_bits; break; case '-': - *mode = *mode &= ~(ch_mode & affected_bits); + *mode &= ~(ch_mode & affected_bits); break; case '=': ++++++ nameversioncompare.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:11.000000000 +0200 @@ -1,11 +1,9 @@ Also compare the name and not only the version when checking if two packages are the same. rh#104066 -Index: lib/depends.c -=================================================================== ---- lib/depends.c.orig -+++ lib/depends.c -@@ -102,6 +102,24 @@ static int removePackage(rpmts ts, Heade +--- ./lib/depends.c.orig 2010-03-24 16:47:28.000000000 +0000 ++++ ./lib/depends.c 2010-03-24 16:52:00.000000000 +0000 +@@ -100,6 +100,24 @@ static int removePackage(rpmts ts, Heade return 0; } @@ -30,7 +28,7 @@ int rpmtsAddInstallElement(rpmts ts, Header h, fnpyKey key, int upgrade, rpmRelocation * relocs) { -@@ -291,7 +309,7 @@ addheader: +@@ -275,7 +293,7 @@ addheader: continue; /* Skip packages that contain identical NEVR. */ @@ -38,18 +36,18 @@ + if (rpmNameVersionCompare(h, oh) == 0) continue; - xx = removePackage(ts, oh, pkgKey); -@@ -342,11 +360,9 @@ addheader: + xx = removePackage(ts, oh, p); +@@ -316,11 +334,9 @@ addheader: * If no obsoletes version info is available, match all names. */ if (rpmdsEVR(obsoletes) == NULL - || rpmdsAnyMatchesDep(oh, obsoletes, _rpmds_nopromote)) { + || rpmdsNVRMatchesDep(oh, obsoletes, _rpmds_nopromote)) { - char * ohNEVRA = headerGetNEVRA(oh, NULL); + char * ohNEVRA = headerGetAsString(oh, RPMTAG_NEVRA); -#ifdef DYING /* XXX see http://bugzilla.redhat.com #134497 */ - if (rpmVersionCompare(h, oh)) -#endif + if (rpmNameVersionCompare(h, oh)) - xx = removePackage(ts, oh, pkgKey); + xx = removePackage(ts, oh, p); rpmlog(RPMLOG_DEBUG, " Obsoletes: %s\t\terases %s\n", rpmdsDNEVR(obsoletes)+2, ohNEVRA); ++++++ repackage-nomd5.diff ++++++ --- ./lib/psm.c.orig 2010-03-26 15:06:20.000000000 +0000 +++ ./lib/psm.c 2010-03-26 15:11:27.000000000 +0000 @@ -1318,6 +1318,7 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s if (psm->goal == PSM_PKGINSTALL) { FD_t payload = NULL; + rpmtransFlags oldtsflags; if (rpmtsFlags(ts) & RPMTRANS_FLAG_JUSTDB) break; @@ -1343,6 +1344,9 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s break; } + oldtsflags = rpmtsFlags(ts); + if (headerIsEntry(fi->h, RPMTAG_REMOVETID)) + (void) rpmtsSetFlags(ts, oldtsflags | RPMTRANS_FLAG_NOMD5); rc = fsmSetup(rpmfiFSM(fi), FSM_PKGINSTALL, ts, psm->te, fi, payload, NULL, &psm->failedFile); (void) rpmswAdd(rpmtsOp(ts, RPMTS_OP_UNCOMPRESS), @@ -1350,6 +1354,8 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s (void) rpmswAdd(rpmtsOp(ts, RPMTS_OP_DIGEST), fdOp(payload, FDSTAT_DIGEST)); xx = fsmTeardown(rpmfiFSM(fi)); + if (headerIsEntry(fi->h, RPMTAG_REMOVETID)) + (void) rpmtsSetFlags(ts, oldtsflags); saveerrno = errno; /* XXX FIXME: Fclose with libio destroys errno */ xx = Fclose(payload); ++++++ rpm-4.7.1.tar.bz2 -> rpm-4.8.0.tar.bz2 ++++++ ++++ 226059 lines of diff (skipped) ++++++ rpm-beecrypt.diff ++++++ ++++ 1068 lines (skipped) ++++ between rpm/rpm-beecrypt.diff ++++ and /mounts/work_src_done/STABLE/rpm/rpm-beecrypt.diff ++++++ rpmdb-no-svc.diff ++++++ --- lib/Makefile.am.orig 2010-03-26 09:34:16.000000000 +0000 +++ lib/Makefile.am 2010-03-26 09:34:39.000000000 +0000 @@ -148,16 +148,6 @@ rpmdb_stat_LDADD = \ $(top_builddir)/db3/util_sig.o \ librpm.la -rpmlibexec_PROGRAMS += rpmdb_svc -rpmdb_svc_SOURCES = -rpmdb_svc_LDADD = \ - $(top_builddir)/db3/db_server_proc.o \ - $(top_builddir)/db3/db_server_svc.o \ - $(top_builddir)/db3/db_server_util.o \ - $(top_builddir)/db3/gen_db_server.o \ - $(top_builddir)/db3/util_log.o \ - librpm.la - rpmlibexec_PROGRAMS += rpmdb_upgrade rpmdb_upgrade_SOURCES = rpmdb_upgrade_LDADD = \ ++++++ safeugid.diff ++++++ --- lib/fsm.c.orig 2010-03-26 15:06:20.000000000 +0000 +++ lib/fsm.c 2010-03-26 15:16:31.000000000 +0000 @@ -736,22 +736,26 @@ static int fsmMapAttrs(FSM_t fsm) /* this check is pretty moot, rpmfi accessors check array bounds etc */ if (fi && i >= 0 && i < rpmfiFC(fi)) { + rpmts ts = fsmGetTs(fsm); mode_t finalMode = rpmfiFModeIndex(fi, i); dev_t finalRdev = rpmfiFRdevIndex(fi, i); time_t finalMtime = rpmfiFMtimeIndex(fi, i); const char *user = rpmfiFUserIndex(fi, i); const char *group = rpmfiFGroupIndex(fi, i); + int safe = rpmtsChrootDone(ts); + extern int unameToUid_safe(const char *, gid_t *, int); + extern int gnameToGid_safe(const char *, gid_t *, int); uid_t uid = 0; gid_t gid = 0; - if (user && unameToUid(user, &uid)) { + if (user && unameToUid_safe(user, &uid, safe)) { if (fsm->goal == FSM_PKGINSTALL) rpmlog(RPMLOG_WARNING, _("user %s does not exist - using root\n"), user); finalMode &= ~S_ISUID; /* turn off suid bit */ } - if (group && gnameToGid(group, &gid)) { + if (group && gnameToGid_safe(group, &gid, safe)) { if (fsm->goal == FSM_PKGINSTALL) rpmlog(RPMLOG_WARNING, _("group %s does not exist - using root\n"), group); @@ -773,8 +777,7 @@ static int fsmMapAttrs(FSM_t fsm) if (fsm->mapFlags & CPIO_MAP_GID) st->st_gid = gid; - { rpmts ts = fsmGetTs(fsm); - + { /* * Set file digest (if not disabled). */ --- lib/misc.c.orig 2009-12-07 14:36:49.000000000 +0000 +++ lib/misc.c 2010-03-26 15:26:05.000000000 +0000 @@ -14,6 +14,42 @@ const char * const RPMVERSION = VERSION; #include "debug.h" +/* + * Unfortunatelly glibc caches nss/nscd data and there is no + * good way to flush those caches when we did a chroot(). Thus + * we need to parse /etc/passwd and /etc/group ourselfs. + */ +static int safe_lookup(const char * file, const char * name) +{ + FILE *fp; + int l; + char buf[4096], *p; + + if (!name || !*name) + return -1; + l = strlen(name); + if ((fp = fopen(file, "r")) == 0) + return -1; + while ((p = fgets(buf, sizeof(buf), fp)) != 0) { + if (*p == '#') + continue; + while (*p && (*p == ' ' || *p == '\t')) + p++; + if (strncmp(p, name, l) != 0 || p[l] != ':') + continue; + p = strchr(p + l + 1, ':'); + if (!p) + continue; + fclose(fp); + p++; + while (*p && (*p == ' ' || *p == '\t')) + p++; + return atoi(p); + } + fclose(fp); + return -1; +} + /* unameToUid(), uidTouname() and the group variants are really poorly implemented. They really ought to use hash tables. I just made the guess that most files would be owned by root or the same person/group @@ -21,11 +57,12 @@ const char * const RPMVERSION = VERSION; is looked up via getpw() and getgr() functions. If this performs too poorly I'll have to implement it properly :-( */ -int unameToUid(const char * thisUname, uid_t * uid) +int unameToUid_safe(const char * thisUname, uid_t * uid, int safe) { static char * lastUname = NULL; static size_t lastUnameLen = 0; static size_t lastUnameAlloced; + static int lastUnameSafe; static uid_t lastUid; struct passwd * pwent; size_t thisUnameLen; @@ -38,6 +75,11 @@ static char * lastUname = NULL; return 0; } + if (safe != lastUnameSafe) { + lastUnameLen = 0; + lastUnameSafe = safe; + } + thisUnameLen = strlen(thisUname); if (lastUname == NULL || thisUnameLen != lastUnameLen || !rstreq(thisUname, lastUname)) @@ -48,15 +90,21 @@ static char * lastUname = NULL; } strcpy(lastUname, thisUname); - pwent = getpwnam(thisUname); - if (pwent == NULL) { - /* FIX: shrug */ - endpwent(); + if (safe) { + int uid = safe_lookup("/etc/passwd", thisUname); + if (uid < 0) + return -1; + lastUid = (uid_t)uid; + } else { pwent = getpwnam(thisUname); - if (pwent == NULL) return -1; + if (pwent == NULL) { + /* FIX: shrug */ + endpwent(); + pwent = getpwnam(thisUname); + if (pwent == NULL) return -1; + } + lastUid = pwent->pw_uid; } - - lastUid = pwent->pw_uid; } *uid = lastUid; @@ -64,11 +112,18 @@ static char * lastUname = NULL; return 0; } -int gnameToGid(const char * thisGname, gid_t * gid) +int unameToUid(const char * thisUname, uid_t * uid) +{ + return unameToUid_safe(thisUname, uid, 0); +} + + +int gnameToGid_safe(const char * thisGname, gid_t * gid, int safe) { static char * lastGname = NULL; static size_t lastGnameLen = 0; static size_t lastGnameAlloced; + static int lastGnameSafe; static gid_t lastGid; size_t thisGnameLen; struct group * grent; @@ -81,6 +136,11 @@ static char * lastGname = NULL; return 0; } + if (safe != lastGnameSafe) { + lastGnameLen = 0; + lastGnameSafe = safe; + } + thisGnameLen = strlen(thisGname); if (lastGname == NULL || thisGnameLen != lastGnameLen || !rstreq(thisGname, lastGname)) @@ -91,25 +151,34 @@ static char * lastGname = NULL; } strcpy(lastGname, thisGname); - grent = getgrnam(thisGname); - if (grent == NULL) { - /* FIX: shrug */ - endgrent(); + if (safe) { + int gid = safe_lookup("/etc/group", thisGname); + if (gid < 0) + return -1; + lastGid = (gid_t)gid; + } else { grent = getgrnam(thisGname); if (grent == NULL) { - /* XXX The filesystem package needs group/lock w/o getgrnam. */ - if (rstreq(thisGname, "lock")) { - *gid = lastGid = 54; - return 0; - } else - if (rstreq(thisGname, "mail")) { - *gid = lastGid = 12; - return 0; - } else - return -1; + /* FIX: shrug */ + endgrent(); + grent = getgrnam(thisGname); + if (grent == NULL) { +#ifdef STRANGE_FEDORA_HACKS + /* XXX The filesystem package needs group/lock w/o getgrnam. */ + if (rstreq(thisGname, "lock")) { + *gid = lastGid = 54; + return 0; + } else + if (rstreq(thisGname, "mail")) { + *gid = lastGid = 12; + return 0; + } else +#endif + return -1; + } } + lastGid = grent->gr_gid; } - lastGid = grent->gr_gid; } *gid = lastGid; @@ -117,6 +186,12 @@ static char * lastGname = NULL; return 0; } +int gnameToGid(const char * thisGname, gid_t * gid) +{ + return gnameToGid_safe(thisGname, gid, 0); +} + + const char * uidToUname(uid_t uid) { static uid_t lastUid = (uid_t) -1; ++++++ suspendlock.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:13.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:13.000000000 +0200 @@ -5,64 +5,9 @@ I hijacked the dbiSync function for this because I did not want to change the ABI. -Index: lib/psm.c -=================================================================== ---- lib/psm.c.orig -+++ lib/psm.c -@@ -756,6 +756,8 @@ static rpmRC runScript(rpmpsm psm, Heade - goto exit; - } - -+ rpmtsSuspendResumeDBLock(psm->ts, 0); -+ - xx = rpmsqFork(&psm->sq); - if (psm->sq.child == 0) { - rpmlog(RPMLOG_DEBUG, "%s: %s\texecv(%s) pid %d\n", -@@ -770,6 +772,8 @@ static rpmRC runScript(rpmpsm psm, Heade - - (void) psmWait(psm); - -+ rpmtsSuspendResumeDBLock(psm->ts, 1); -+ - if (psm->sq.reaped < 0) { - rpmlog(RPMLOG_ERR, _("%s scriptlet failed, waitpid(%d) rc %d: %s\n"), - sname, psm->sq.child, psm->sq.reaped, strerror(errno)); -Index: lib/rpmts.c -=================================================================== ---- lib/rpmts.c.orig -+++ lib/rpmts.c -@@ -108,6 +108,11 @@ int rpmtsOpenDB(rpmts ts, int dbmode) - return rc; - } - -+int rpmtsSuspendResumeDBLock(rpmts ts, int mode) -+{ -+ return rpmdbSuspendResumeDBLock(ts->rdb, mode); -+} -+ - int rpmtsInitDB(rpmts ts, int dbmode) - { - void *lock = rpmtsAcquireLock(ts); -Index: lib/rpmts.h -=================================================================== ---- lib/rpmts.h.orig -+++ lib/rpmts.h -@@ -472,6 +472,10 @@ rpmdb rpmtsGetRdb(rpmts ts); - */ - int rpmtsInitDSI(const rpmts ts); - -+int rpmtsSuspendResumeDBLock(rpmts ts, int mode) -+ /*@globals fileSystem @*/ -+ /*@modifies fileSystem @*/; -+ - /** \ingroup rpmts - * Update disk space info for a file. - * @param ts transaction set -Index: lib/backend/db3.c -=================================================================== ---- lib/backend/db3.c.orig -+++ lib/backend/db3.c -@@ -398,12 +398,18 @@ errxit: +--- ./lib/backend/db3.c.orig 2010-03-25 14:35:39.000000000 +0000 ++++ ./lib/backend/db3.c 2010-03-25 14:44:42.000000000 +0000 +@@ -208,11 +208,17 @@ errxit: return rc; } @@ -72,16 +17,15 @@ { DB * db = dbi->dbi_db; int rc = 0; - int _printit; + if (flags == (unsigned int)-1) + return db3SuspendResumeLock(dbi, 0); + if (flags == (unsigned int)-2) + return db3SuspendResumeLock(dbi, 1); - if (db != NULL) + if (db != NULL) { rc = db->sync(db, flags); - /* XXX DB_INCOMPLETE is returned occaisionally with multiple access. */ -@@ -1122,6 +1128,50 @@ static int db3open(rpmdb rpmdb, rpmTag r + rc = cvtdberr(dbi, "db->sync", rc, _debug); +@@ -848,6 +854,48 @@ static int db3open(rpmdb rpmdb, rpmTag r return rc; } @@ -97,8 +41,6 @@ + return 0; + if (!(dbi->dbi_mode & (O_RDWR|O_WRONLY))) + return 0; -+ if ((dbi->dbi_ecflags & DB_CLIENT) && dbi->dbi_host) -+ return 0; + if (dbi->dbi_use_dbenv && _lockdbfd == 0) + return 0; + if (!(dbi->dbi_db->fd(dbi->dbi_db, &fdno) == 0 && fdno >= 0)) @@ -132,11 +74,29 @@ /** \ingroup db3 */ RPM_GNUC_INTERNAL -Index: lib/rpmdb.c -=================================================================== ---- lib/rpmdb.c.orig -+++ lib/rpmdb.c -@@ -886,6 +886,21 @@ int rpmdbSync(rpmdb db) +--- ./lib/psm.c.orig 2010-03-25 14:43:29.000000000 +0000 ++++ ./lib/psm.c 2010-03-25 14:43:41.000000000 +0000 +@@ -754,6 +754,8 @@ static rpmRC runScript(rpmpsm psm, Heade + goto exit; + } + ++ rpmtsSuspendResumeDBLock(psm->ts, 0); ++ + xx = rpmsqFork(&psm->sq); + if (psm->sq.child == 0) { + rpmlog(RPMLOG_DEBUG, "%s: %s\texecv(%s) pid %d\n", +@@ -768,6 +770,8 @@ static rpmRC runScript(rpmpsm psm, Heade + + (void) psmWait(psm); + ++ rpmtsSuspendResumeDBLock(psm->ts, 1); ++ + if (psm->sq.reaped < 0) { + rpmlog(RPMLOG_ERR, _("%s scriptlet failed, waitpid(%d) rc %d: %s\n"), + sname, psm->sq.child, psm->sq.reaped, strerror(errno)); +--- ./lib/rpmdb.c.orig 2010-03-25 14:36:57.000000000 +0000 ++++ ./lib/rpmdb.c 2010-03-25 14:43:41.000000000 +0000 +@@ -903,6 +903,21 @@ int rpmdbSync(rpmdb db) return rc; } @@ -158,3 +118,30 @@ /* FIX: dbTemplate structure assignment */ static rpmdb newRpmdb(const char * root, +--- ./lib/rpmts.c.orig 2009-12-17 09:05:37.000000000 +0000 ++++ ./lib/rpmts.c 2010-03-25 14:43:41.000000000 +0000 +@@ -89,6 +89,11 @@ int rpmtsOpenDB(rpmts ts, int dbmode) + return rc; + } + ++int rpmtsSuspendResumeDBLock(rpmts ts, int mode) ++{ ++ return rpmdbSuspendResumeDBLock(ts->rdb, mode); ++} ++ + int rpmtsInitDB(rpmts ts, int dbmode) + { + void *lock = rpmtsAcquireLock(ts); +--- ./lib/rpmts.h.orig 2009-12-17 09:05:37.000000000 +0000 ++++ ./lib/rpmts.h 2010-03-25 14:43:41.000000000 +0000 +@@ -469,6 +469,10 @@ rpmdb rpmtsGetRdb(rpmts ts); + void * rpmtsNotify(rpmts ts, rpmte te, + rpmCallbackType what, rpm_loff_t amount, rpm_loff_t total); + ++int rpmtsSuspendResumeDBLock(rpmts ts, int mode) ++ /*@globals fileSystem @*/ ++ /*@modifies fileSystem @*/; ++ + /** \ingroup rpmts + * Return number of (ordered) transaction set elements. + * @param ts transaction set ++++++ taggedfileindex.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:13.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:13.000000000 +0200 @@ -2,11 +2,9 @@ fingerprint semantics. rh#103204 -Index: lib/rpmdb.c -=================================================================== ---- lib/rpmdb.c.orig -+++ lib/rpmdb.c -@@ -1107,6 +1107,16 @@ int rpmdbVerify(const char * prefix) +--- ./lib/rpmdb.c.orig 2010-03-25 14:43:41.000000000 +0000 ++++ ./lib/rpmdb.c 2010-03-25 15:15:14.000000000 +0000 +@@ -1122,6 +1122,16 @@ int rpmdbVerify(const char * prefix) return rc; } @@ -23,7 +21,7 @@ /** * Find file matches in database. * @param db rpm database -@@ -1169,6 +1179,11 @@ static int rpmdbFindByFile(rpmdb db, con +@@ -1181,6 +1191,11 @@ static int rpmdbFindByFile(rpmdb db, con if (rc == 0) (void) dbt2set(dbi, data, &allMatches); @@ -35,16 +33,16 @@ xx = dbiCclose(dbi, dbcursor, 0); dbcursor = NULL; } else -@@ -2172,7 +2187,7 @@ void rpmdbSortIterator(rpmdbMatchIterato +@@ -2182,7 +2197,7 @@ void rpmdbSortIterator(rpmdbMatchIterato + } } - /* LCL: segfault */ -static int rpmdbGrowIterator(rpmdbMatchIterator mi) +static int rpmdbGrowIterator(rpmdbMatchIterator mi, unsigned int tag) { DBC * dbcursor; DBT * key; -@@ -2222,6 +2237,27 @@ static int rpmdbGrowIterator(rpmdbMatchI +@@ -2232,6 +2247,27 @@ static int rpmdbGrowIterator(rpmdbMatchI dbcursor = NULL; #endif @@ -72,7 +70,7 @@ if (mi->mi_set == NULL) { mi->mi_set = set; } else { -@@ -2403,7 +2439,15 @@ int rpmdbExtendIterator(rpmdbMatchIterat +@@ -2413,7 +2449,15 @@ int rpmdbExtendIterator(rpmdbMatchIterat { mi->mi_key.data = (void *) keyp; mi->mi_key.size = keylen ? keylen : strlen(keyp); @@ -89,7 +87,7 @@ } /* -@@ -2798,8 +2842,16 @@ int rpmdbAdd(rpmdb db, int iid, Header h +@@ -2808,8 +2852,16 @@ int rpmdbAdd(rpmdb db, int iid, Header h if (hdrNum) { @@ -106,7 +104,7 @@ if (dbiTags.tags != NULL) for (dbix = 0; dbix < dbiTags.max; dbix++) { rpmTag rpmtag; -@@ -2891,6 +2943,10 @@ int rpmdbAdd(rpmdb db, int iid, Header h +@@ -2901,6 +2953,10 @@ int rpmdbAdd(rpmdb db, int iid, Header h */ i = rec->tagNum = rpmtdGetIndex(&tagdata); switch (rpmtag) { @@ -117,7 +115,7 @@ case RPMTAG_REQUIRENAME: { /* Filter out install prerequisites. */ rpm_flag_t *rflag = rpmtdNextUint32(&reqflags); -@@ -2976,6 +3032,9 @@ cont: +@@ -2986,6 +3042,9 @@ cont: if (ret == 0) { headerSetInstance(h, hdrNum); } @@ -127,11 +125,9 @@ } exit: -Index: lib/rpmdb_internal.h -=================================================================== ---- lib/rpmdb_internal.h.orig -+++ lib/rpmdb_internal.h -@@ -540,6 +540,9 @@ unsigned int dbiIndexRecordFileNumber(db +--- ./lib/rpmdb_internal.h.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/rpmdb_internal.h 2010-03-25 15:14:38.000000000 +0000 +@@ -542,6 +542,9 @@ const char *rpmdbHome(rpmdb db); int rpmdbExtendIterator(rpmdbMatchIterator mi, const void * keyp, size_t keylen); @@ -141,13 +137,11 @@ /** \ingroup rpmdb * sort the iterator by (recnum, filenum) * Return database iterator. -Index: lib/transaction.c -=================================================================== ---- lib/transaction.c.orig -+++ lib/transaction.c -@@ -609,9 +609,12 @@ rpmdbMatchIterator rpmFindBaseNamesInDB( +--- ./lib/transaction.c.orig 2010-03-25 14:38:27.000000000 +0000 ++++ ./lib/transaction.c 2010-03-25 15:14:38.000000000 +0000 +@@ -848,9 +848,12 @@ rpmdbMatchIterator rpmFindBaseNamesInDB( rpmdbMatchIterator mi; - int i, xx; + int xx; const char * baseName; + const char * dirName; @@ -158,8 +152,8 @@ mi = rpmdbInitIterator(rpmtsGetRdb(ts), RPMTAG_BASENAMES, NULL, 0); -@@ -629,18 +632,25 @@ rpmdbMatchIterator rpmFindBaseNamesInDB( - while ((i = rpmfiNext(fi)) >= 0) { +@@ -868,18 +871,25 @@ rpmdbMatchIterator rpmFindBaseNamesInDB( + while (rpmfiNext(fi) >= 0) { size_t keylen; baseName = rpmfiBN(fi); + dirName = rpmfiDN(fi); ++++++ waitlock.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:13.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:13.000000000 +0200 @@ -1,10 +1,9 @@ Fix global (DB_PRIVATE) lock code: fix recursion counter, retry failed lock operations for up to 3 minutes. -Index: lib/backend/db3.c -=================================================================== ---- lib/backend/db3.c.orig -+++ lib/backend/db3.c -@@ -586,6 +586,8 @@ static int db3stat(dbiIndex dbi, unsigne + +--- ./lib/backend/db3.c.orig 2010-03-25 14:44:42.000000000 +0000 ++++ ./lib/backend/db3.c 2010-03-25 14:52:05.000000000 +0000 +@@ -394,6 +394,8 @@ static int db3stat(dbiIndex dbi, unsigne return rc; } @@ -13,18 +12,17 @@ static int db3close(dbiIndex dbi, unsigned int flags) { rpmdb rpmdb = dbi->dbi_rpmdb; -@@ -632,6 +634,10 @@ static int db3close(dbiIndex dbi, unsign +@@ -414,6 +416,9 @@ static int db3close(dbiIndex dbi, unsign rpmlog(RPMLOG_DEBUG, "closed db index %s/%s\n", - dbhome, (dbfile ? dbfile : rpmTagGetName(dbi->dbi_rpmtag))); + dbhome, dbi->dbi_file); + if (dbi->dbi_lockdbfd && -+ !((dbi->dbi_ecflags & DB_CLIENT) && dbi->dbi_host) && + _lockdbfd) + _lockdbfd--; } if (rpmdb->db_dbenv != NULL && dbi->dbi_use_dbenv) { -@@ -899,8 +905,6 @@ static int db3open(rpmdb rpmdb, rpmTag r +@@ -645,8 +651,6 @@ static int db3open(rpmdb rpmdb, rpmTag r } if (rc == 0) { @@ -33,7 +31,7 @@ rc = db_create(&db, dbenv, dbi->dbi_cflags); rc = cvtdberr(dbi, "db_create", rc, _debug); if (rc == 0 && db != NULL) { -@@ -1082,6 +1086,7 @@ static int db3open(rpmdb rpmdb, rpmTag r +@@ -810,6 +814,7 @@ static int db3open(rpmdb rpmdb, rpmTag r if (!(db->fd(db, &fdno) == 0 && fdno >= 0)) { rc = 1; } else { @@ -41,7 +39,7 @@ struct flock l; memset(&l, 0, sizeof(l)); l.l_whence = 0; -@@ -1091,24 +1096,40 @@ static int db3open(rpmdb rpmdb, rpmTag r +@@ -819,24 +824,39 @@ static int db3open(rpmdb rpmdb, rpmTag r ? F_RDLCK : F_WRLCK; l.l_pid = 0; @@ -49,27 +47,29 @@ - if (rc) { - /* Warning iff using non-private CDB locking. */ - rc = ((dbi->dbi_use_dbenv && -+ for (tries = 0; ; tries++) { -+ rc = fcntl(fdno, F_SETLK, (void *) &l); -+ if (rc) { -+ rc = ((dbi->dbi_use_dbenv && - (dbi->dbi_eflags & DB_INIT_CDB) && - !(dbi->dbi_eflags & DB_PRIVATE)) +- (dbi->dbi_eflags & DB_INIT_CDB) && +- !(dbi->dbi_eflags & DB_PRIVATE)) - ? 0 : 1); - rpmlog( (rc ? RPMLOG_ERR : RPMLOG_WARNING), - _("cannot get %s lock on %s/%s\n"), - ((dbi->dbi_mode & O_ACCMODE) == O_RDONLY) - ? _("shared") : _("exclusive"), -- dbhome, (dbfile ? dbfile : "")); -- } else if (dbfile) { +- dbhome, dbi->dbi_file); +- } else { - rpmlog(RPMLOG_DEBUG, - "locked db index %s/%s\n", -- dbhome, dbfile); +- dbhome, dbi->dbi_file); ++ for (tries = 0; ; tries++) { ++ rc = fcntl(fdno, F_SETLK, (void *) &l); ++ if (rc) { ++ rc = ((dbi->dbi_use_dbenv && ++ (dbi->dbi_eflags & DB_INIT_CDB) && ++ !(dbi->dbi_eflags & DB_PRIVATE)) + ? 0 : 1); + if (errno == EAGAIN && rc) { + struct timespec ts; + if (tries == 0) -+ rpmlog(RPMLOG_WARNING, _("waiting for %s lock on %s/%s\n"), ((dbi->dbi_mode & (O_RDWR|O_WRONLY)) ? _("exclusive") : _("shared")), dbhome, (dbfile ? dbfile : "")); ++ rpmlog(RPMLOG_WARNING, _("waiting for %s lock on %s/%s\n"), ((dbi->dbi_mode & (O_RDWR|O_WRONLY)) ? _("exclusive") : _("shared")), dbhome, dbi->dbi_file); + ts.tv_sec = (time_t)0; + ts.tv_nsec = 100000000; + if (tries < 10*60*3) { @@ -81,14 +81,13 @@ + _("cannot get %s lock on %s/%s\n"), + ((dbi->dbi_mode & O_ACCMODE) == O_RDONLY) + ? _("shared") : _("exclusive"), -+ dbhome, (dbfile ? dbfile : "")); -+ } else if (dbfile) { ++ dbhome, dbi->dbi_file); ++ } else { + rpmlog(RPMLOG_DEBUG, + "locked db index %s/%s\n", -+ dbhome, dbfile); -+ break; ++ dbhome, dbi->dbi_file); + } -+ ++ break; } } + if (rc && dbi->dbi_use_dbenv) ++++++ weakdeps.diff ++++++ --- /var/tmp/diff_new_pack.A0YKNv/_old 2010-04-01 18:15:13.000000000 +0200 +++ /var/tmp/diff_new_pack.A0YKNv/_new 2010-04-01 18:15:13.000000000 +0200 @@ -14,11 +14,9 @@ Needs extcond.diff for query operations. -Index: build/parsePreamble.c -=================================================================== ---- build/parsePreamble.c.orig -+++ build/parsePreamble.c -@@ -122,6 +122,8 @@ static struct tokenBits_s const installS +--- ./build/parsePreamble.c.orig 2009-12-17 09:05:55.000000000 +0000 ++++ ./build/parsePreamble.c 2010-03-25 14:56:24.000000000 +0000 +@@ -124,6 +124,8 @@ static struct tokenBits_s const installS { "post", RPMSENSE_SCRIPT_POST }, { "rpmlib", RPMSENSE_RPMLIB }, { "verify", RPMSENSE_SCRIPT_VERIFY }, @@ -27,7 +25,7 @@ { NULL, 0 } }; -@@ -132,6 +134,8 @@ static const struct tokenBits_s const bu +@@ -134,6 +136,8 @@ static const struct tokenBits_s const bu { "build", RPMSENSE_SCRIPT_BUILD }, { "install", RPMSENSE_SCRIPT_INSTALL }, { "clean", RPMSENSE_SCRIPT_CLEAN }, @@ -36,7 +34,7 @@ { NULL, 0 } }; -@@ -637,6 +641,18 @@ static int handlePreambleTag(rpmSpec spe +@@ -649,6 +653,18 @@ static int handlePreambleTag(rpmSpec spe if ((rc = parseRCPOT(spec, pkg, field, tag, 0, tagflags))) return rc; break; @@ -55,26 +53,24 @@ case RPMTAG_EXCLUDEARCH: case RPMTAG_EXCLUSIVEARCH: case RPMTAG_EXCLUDEOS: -@@ -734,6 +750,14 @@ static struct PreambleRec_s preambleList - {RPMTAG_AUTOPROV, 0, 0, 0, "autoprov"}, - {RPMTAG_DOCDIR, 0, 0, 0, "docdir"}, - {RPMTAG_DISTTAG, 0, 0, 0, "disttag"}, -+ {RPMTAG_SUGGESTSFLAGS, 0, 0, 0, "recommends"}, -+ {RPMTAG_SUGGESTSFLAGS, 0, 0, 0, "suggests"}, -+ {RPMTAG_ENHANCESFLAGS, 0, 0, 0, "supplements"}, -+ {RPMTAG_ENHANCESFLAGS, 0, 0, 0, "enhances"}, -+ {RPMTAG_BUILDSUGGESTS, 0, 0, 0, "buildrecommends"}, -+ {RPMTAG_BUILDSUGGESTS, 0, 0, 0, "buildsuggests"}, -+ {RPMTAG_BUILDENHANCES, 0, 0, 0, "buildsupplements"}, -+ {RPMTAG_BUILDENHANCES, 0, 0, 0, "buildenhances"}, - /* LCL: can't add null annotation */ - {0, 0, 0, 0, 0} +@@ -748,6 +764,14 @@ static struct PreambleRec_s const preamb + {RPMTAG_DOCDIR, 0, 0, LEN_AND_STR("docdir")}, + {RPMTAG_DISTTAG, 0, 0, LEN_AND_STR("disttag")}, + {RPMTAG_BUGURL, 0, 0, LEN_AND_STR("bugurl")}, ++ {RPMTAG_SUGGESTSFLAGS, 0, 0, LEN_AND_STR("recommends")}, ++ {RPMTAG_SUGGESTSFLAGS, 0, 0, LEN_AND_STR("suggests")}, ++ {RPMTAG_ENHANCESFLAGS, 0, 0, LEN_AND_STR("supplements")}, ++ {RPMTAG_ENHANCESFLAGS, 0, 0, LEN_AND_STR("enhances")}, ++ {RPMTAG_BUILDSUGGESTS, 0, 0, LEN_AND_STR("buildrecommends")}, ++ {RPMTAG_BUILDSUGGESTS, 0, 0, LEN_AND_STR("buildsuggests")}, ++ {RPMTAG_BUILDENHANCES, 0, 0, LEN_AND_STR("buildsupplements")}, ++ {RPMTAG_BUILDENHANCES, 0, 0, LEN_AND_STR("buildenhances")}, + {0, 0, 0, 0} }; -Index: build/parseReqs.c -=================================================================== ---- build/parseReqs.c.orig -+++ build/parseReqs.c -@@ -84,6 +84,14 @@ rpmRC parseRCPOT(rpmSpec spec, Package p + +--- ./build/parseReqs.c.orig 2009-12-17 09:05:55.000000000 +0000 ++++ ./build/parseReqs.c 2010-03-25 14:53:47.000000000 +0000 +@@ -85,6 +85,14 @@ rpmRC parseRCPOT(rpmSpec spec, Package p tagflags |= RPMSENSE_ANY; h = spec->buildRestrictions; break; @@ -89,11 +85,9 @@ default: case RPMTAG_REQUIREFLAGS: tagflags |= RPMSENSE_ANY; -Index: build/reqprov.c -=================================================================== ---- build/reqprov.c.orig -+++ build/reqprov.c -@@ -43,6 +43,16 @@ int addReqProv(rpmSpec spec, Header h, r +--- ./build/reqprov.c.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./build/reqprov.c 2010-03-25 14:53:47.000000000 +0000 +@@ -75,6 +75,16 @@ int addReqProv(rpmSpec spec, Header h, r flagtag = RPMTAG_TRIGGERFLAGS; indextag = RPMTAG_TRIGGERINDEX; extra = Flags & RPMSENSE_TRIGGER; @@ -110,11 +104,9 @@ } else { nametag = RPMTAG_REQUIRENAME; versiontag = RPMTAG_REQUIREVERSION; -Index: build/rpmfc.c -=================================================================== ---- build/rpmfc.c.orig -+++ build/rpmfc.c -@@ -1377,6 +1377,12 @@ static struct DepMsg_s depMsgs[] = { +--- ./build/rpmfc.c.orig 2009-12-09 13:37:25.000000000 +0000 ++++ ./build/rpmfc.c 2010-03-25 14:53:47.000000000 +0000 +@@ -1405,6 +1405,12 @@ static struct DepMsg_s depMsgs[] = { { "Obsoletes", { "%{?__find_obsoletes}", NULL, NULL, NULL }, RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS, 0, -1 }, @@ -127,7 +119,7 @@ { NULL, { NULL, NULL, NULL, NULL }, 0, 0, 0, 0, 0 } }; -@@ -1467,6 +1473,14 @@ static int rpmfcGenerateDependsHelper(co +@@ -1490,6 +1496,14 @@ static int rpmfcGenerateDependsHelper(co failnonzero = 0; tagflags = RPMSENSE_FIND_REQUIRES; break; @@ -142,66 +134,9 @@ default: continue; break; -Index: python/rpmmodule.c -=================================================================== ---- python/rpmmodule.c.orig -+++ python/rpmmodule.c -@@ -387,7 +387,7 @@ void init_rpm(void) - REGISTER_ENUM(RPMSENSE_RPMLIB); - REGISTER_ENUM(RPMSENSE_TRIGGERPREIN); - REGISTER_ENUM(RPMSENSE_KEYRING); -- REGISTER_ENUM(RPMSENSE_PATCHES); -+ REGISTER_ENUM(RPMSENSE_STRONG); - REGISTER_ENUM(RPMSENSE_CONFIG); - - REGISTER_ENUM(RPMTRANS_FLAG_TEST); -Index: lib/rpmds.c -=================================================================== ---- lib/rpmds.c.orig -+++ lib/rpmds.c -@@ -73,6 +73,10 @@ static int dsType(rpmTag tag, - t = "Trigger"; - evr = RPMTAG_TRIGGERVERSION; - f = RPMTAG_TRIGGERFLAGS; -+ } else if (tag == RPMTAG_ENHANCESNAME) { -+ t = "Enhances"; -+ evr = RPMTAG_ENHANCESVERSION; -+ f = RPMTAG_ENHANCESFLAGS; - } else { - rc = 1; - } -Index: rpmpopt.in -=================================================================== ---- rpmpopt.in.orig -+++ rpmpopt.in -@@ -65,6 +65,22 @@ rpm alias --requires --qf \ - --POPTdesc=$"list capabilities required by package(s)" - rpm alias -R --requires - -+rpm alias --suggests --qf \ -+ "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \ -+ --POPTdesc=$"list capabilities this package suggests" -+ -+rpm alias --recommends --qf \ -+ "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \ -+ --POPTdesc=$"list capabilities this package recommends" -+ -+rpm alias --enhances --qf \ -+ "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \ -+ --POPTdesc=$"list capabilities this package enhances" -+ -+rpm alias --supplements --qf \ -+ "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \ -+ --POPTdesc=$"list capabilities this package supplements" -+ - rpm alias --info --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\ - Version : %-27{VERSION} Vendor: %{VENDOR}\n\ - Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\ -Index: lib/formats.c -=================================================================== ---- lib/formats.c.orig -+++ lib/formats.c -@@ -601,6 +601,25 @@ static char * depflagsFormat(rpmtd td, c +--- ./lib/formats.c.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/formats.c 2010-03-25 15:00:15.000000000 +0000 +@@ -601,6 +601,24 @@ static char * depflagsFormat(rpmtd td, c return val; } @@ -220,24 +155,34 @@ + strcat(formatPrefix, "s"); + rasprintf(&val, formatPrefix, buf); + } -+ + return val; +} + /** * Return tag container array size. * @param td tag data container -@@ -661,5 +680,6 @@ static const struct headerFormatFunc_s r - { RPMTD_FORMAT_DAY, "day", dayFormat }, - { RPMTD_FORMAT_SHESCAPE, "shescape", shescapeFormat }, +@@ -738,5 +756,6 @@ static const struct headerFormatFunc_s r { RPMTD_FORMAT_ARRAYSIZE, "arraysize", arraysizeFormat }, -+ { RPMTD_FORMAT_DEPFLAG_STRONG, "depflag_strong", { depflag_strongFormat } }, + { RPMTD_FORMAT_FSTATE, "fstate", fstateFormat }, + { RPMTD_FORMAT_VFLAGS, "vflags", vflagsFormat }, ++ { RPMTD_FORMAT_DEPFLAG_STRONG, "depflag_strong", depflag_strongFormat }, { -1, NULL, NULL } }; -Index: lib/rpmds.h -=================================================================== ---- lib/rpmds.h.orig -+++ lib/rpmds.h +--- ./lib/rpmds.c.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/rpmds.c 2010-03-25 14:53:47.000000000 +0000 +@@ -66,6 +66,10 @@ static int dsType(rpmTag tag, + t = "Trigger"; + evr = RPMTAG_TRIGGERVERSION; + f = RPMTAG_TRIGGERFLAGS; ++ } else if (tag == RPMTAG_ENHANCESNAME) { ++ t = "Enhances"; ++ evr = RPMTAG_ENHANCESVERSION; ++ f = RPMTAG_ENHANCESFLAGS; + } else { + rc = 1; + } +--- ./lib/rpmds.h.orig 2010-03-24 16:47:28.000000000 +0000 ++++ ./lib/rpmds.h 2010-03-25 14:53:47.000000000 +0000 @@ -55,7 +55,7 @@ typedef enum rpmsenseFlags_e { RPMSENSE_RPMLIB = (1 << 24), /*!< rpmlib(feature) dependency. */ RPMSENSE_TRIGGERPREIN = (1 << 25), /*!< %triggerprein dependency. */ @@ -255,22 +200,8 @@ RPMSENSE_SCRIPT_PREP | \ RPMSENSE_SCRIPT_BUILD | \ RPMSENSE_SCRIPT_INSTALL | \ -Index: lib/rpmtd.h -=================================================================== ---- lib/rpmtd.h.orig -+++ lib/rpmtd.h -@@ -214,6 +214,7 @@ typedef enum rpmtdFormats_e { - RPMTD_FORMAT_SHESCAPE = 13, /* shell escaped (any type) */ - RPMTD_FORMAT_ARRAYSIZE = 14, /* size of contained array (any type) */ - RPMTD_FORMAT_DEPTYPE = 15, /* dependency types (int32 types) */ -+ RPMTD_FORMAT_DEPFLAG_STRONG = 16, /* strong dependency */ - } rpmtdFormats; - - /** \ingroup rpmtd -Index: lib/rpmtag.h -=================================================================== ---- lib/rpmtag.h.orig -+++ lib/rpmtag.h +--- ./lib/rpmtag.h.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/rpmtag.h 2010-03-25 14:53:47.000000000 +0000 @@ -228,14 +228,14 @@ typedef enum rpmTag_e { RPMTAG_PRETRANSPROG = 1153, /* s */ RPMTAG_POSTTRANSPROG = 1154, /* s */ @@ -294,3 +225,49 @@ RPMTAG_PRIORITY = 1162, /* i[] extension placeholder (unimplemented) */ RPMTAG_CVSID = 1163, /* s (unimplemented) */ #define RPMTAG_SVNID RPMTAG_CVSID /* s (unimplemented) */ +--- ./lib/rpmtd.h.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./lib/rpmtd.h 2010-03-25 14:58:31.000000000 +0000 +@@ -216,6 +216,7 @@ typedef enum rpmtdFormats_e { + RPMTD_FORMAT_DEPTYPE = 15, /* dependency types (int types) */ + RPMTD_FORMAT_FSTATE = 16, /* file states (int types) */ + RPMTD_FORMAT_VFLAGS = 17, /* file verify flags (int types) */ ++ RPMTD_FORMAT_DEPFLAG_STRONG = 18, /* strong dependency */ + } rpmtdFormats; + + /** \ingroup rpmtd +--- ./python/rpmmodule.c.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./python/rpmmodule.c 2010-03-25 14:53:47.000000000 +0000 +@@ -373,7 +373,7 @@ static int initModule(PyObject *m) + REGISTER_ENUM(RPMSENSE_RPMLIB); + REGISTER_ENUM(RPMSENSE_TRIGGERPREIN); + REGISTER_ENUM(RPMSENSE_KEYRING); +- REGISTER_ENUM(RPMSENSE_PATCHES); ++ REGISTER_ENUM(RPMSENSE_STRONG); + REGISTER_ENUM(RPMSENSE_CONFIG); + + REGISTER_ENUM(RPMTRANS_FLAG_TEST); +--- ./rpmpopt.in.orig 2009-12-07 14:36:49.000000000 +0000 ++++ ./rpmpopt.in 2010-03-25 14:53:47.000000000 +0000 +@@ -65,6 +65,22 @@ rpm alias --requires --qf \ + --POPTdesc=$"list capabilities required by package(s)" + rpm alias -R --requires + ++rpm alias --suggests --qf \ ++ "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \ ++ --POPTdesc=$"list capabilities this package suggests" ++ ++rpm alias --recommends --qf \ ++ "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \ ++ --POPTdesc=$"list capabilities this package recommends" ++ ++rpm alias --enhances --qf \ ++ "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \ ++ --POPTdesc=$"list capabilities this package enhances" ++ ++rpm alias --supplements --qf \ ++ "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \ ++ --POPTdesc=$"list capabilities this package supplements" ++ + rpm alias --info --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\ + Version : %-27{VERSION} Vendor: %{VENDOR}\n\ + Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdevelop4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdevelop4 for openSUSE:Factory checked in at Thu Apr 1 18:15:04 CEST 2010. -------- --- KDE/kdevelop4/kdevelop4.changes 2010-02-12 22:15:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdevelop4/kdevelop4.changes 2010-03-09 10:45:23.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 9 09:45:01 UTC 2010 - wstephenson(a)suse.de + +- update to 3.9.99 (4.0 Beta 9) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdevelop-3.9.98.tar.bz2 New: ---- kdevelop-3.9.99.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4.spec ++++++ --- /var/tmp/diff_new_pack.BhwQvn/_old 2010-04-01 18:14:57.000000000 +0200 +++ /var/tmp/diff_new_pack.BhwQvn/_new 2010-04-01 18:14:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdevelop4 (Version 3.9.98) +# spec file for package kdevelop4 (Version 3.9.99) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ Group: Development/Tools/IDE Summary: Integrated Development Environment for the X Window System, Qt, KDE, and GNOME Url: http://www.kdevelop.org -Version: 3.9.98 +Version: 3.9.99 Release: 1 Source0: kdevelop-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdevelop-3.9.98.tar.bz2 -> kdevelop-3.9.99.tar.bz2 ++++++ ++++ 6552 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 kdewebdev4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdewebdev4 for openSUSE:Factory checked in at Thu Apr 1 18:15:00 CEST 2010. -------- --- KDE/kdewebdev4/kdewebdev4.changes 2010-02-26 20:59:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdewebdev4/kdewebdev4.changes 2010-03-26 19:38:28.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 26 19:38:22 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdewebdev-4.4.1.tar.bz2 New: ---- kdewebdev-4.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdewebdev4.spec ++++++ --- /var/tmp/diff_new_pack.pt29tU/_old 2010-04-01 18:14:46.000000000 +0200 +++ /var/tmp/diff_new_pack.pt29tU/_new 2010-04-01 18:14:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdewebdev4 (Version 4.4.1) +# spec file for package kdewebdev4 (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,7 +27,7 @@ Group: System/GUI/KDE Summary: kdewebdev base package Url: http://quanta.sf.net -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdewebdev-%version.tar.bz2 Patch0: 4_4_BRANCH.diff ++++++ kdewebdev-4.4.1.tar.bz2 -> kdewebdev-4.4.2.tar.bz2 ++++++ Files old/kdewebdev-4.4.1/doc/kfilereplace/index.cache.bz2 and new/kdewebdev-4.4.2/doc/kfilereplace/index.cache.bz2 differ Files old/kdewebdev-4.4.1/doc/kimagemapeditor/index.cache.bz2 and new/kdewebdev-4.4.2/doc/kimagemapeditor/index.cache.bz2 differ Files old/kdewebdev-4.4.1/doc/klinkstatus/index.cache.bz2 and new/kdewebdev-4.4.2/doc/klinkstatus/index.cache.bz2 differ Files old/kdewebdev-4.4.1/doc/kommander/index.cache.bz2 and new/kdewebdev-4.4.2/doc/kommander/index.cache.bz2 differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiosktool for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kiosktool for openSUSE:Factory checked in at Thu Apr 1 18:14:45 CEST 2010. -------- --- KDE/kiosktool/kiosktool.changes 2009-12-27 08:45:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiosktool/kiosktool.changes 2010-03-11 23:57:38.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 11 22:47:31 UTC 2010 - llunak(a)novell.com + +- make the KDE4 version actually somewhat useful (bnc#568154) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- glibc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiosktool.spec ++++++ --- /var/tmp/diff_new_pack.gqpaWj/_old 2010-04-01 18:14:32.000000000 +0200 +++ /var/tmp/diff_new_pack.gqpaWj/_new 2010-04-01 18:14:32.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package kiosktool (Version 1.99.svn958038) +# spec file for package kiosktool (Version 1.99.svn1102156) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,11 +23,10 @@ License: GPLv2+ Group: System/Management Summary: Kiosk Admin Tool -Version: 1.99.svn958038 -Release: 2 +Version: 1.99.svn1102156 +Release: 1 # $SVNROOT/trunk/extragear/sysadmin/kiosktool Source0: sysadmin.tar.bz2 -Patch1: glibc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Provides: kde4-kiosktool = 4.2.1.svn942192 @@ -45,10 +44,9 @@ %prep %setup -q -n sysadmin -%patch1 %build - %cmake_kde4 -d build + %cmake_kde4 -d build -- -DKDE_DEFAULT_HOME=.kde4 %make_jobs %install ++++++ sysadmin.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/CMakeLists.txt new/sysadmin/CMakeLists.txt --- old/sysadmin/CMakeLists.txt 2008-02-26 08:35:50.000000000 +0100 +++ new/sysadmin/CMakeLists.txt 2009-04-18 14:42:44.000000000 +0200 @@ -6,9 +6,21 @@ include (MacroLibrary) include(MacroOptionalAddSubdirectory) -add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS}) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${extragear-sysadmin_SOURCE_DIR}/partitionmanager/cmake/modules/) + +add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_STRICT_ITERATORS) include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) if(NOT WIN32) macro_optional_add_subdirectory(kiosktool) + + find_package(LIBPARTED) + FIND_PACKAGE(PkgConfig REQUIRED) + PKG_CHECK_MODULES(UUID uuid) + PKG_CHECK_MODULES(BLKID blkid) + + if (LIBPARTED_FOUND AND UUID_FOUND AND BLKID_FOUND) + macro_optional_add_subdirectory(partitionmanager) + endif(LIBPARTED_FOUND AND UUID_FOUND AND BLKID_FOUND) macro_optional_add_subdirectory(doc) + endif(NOT WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/doc/CMakeLists.txt new/sysadmin/doc/CMakeLists.txt --- old/sysadmin/doc/CMakeLists.txt 2008-02-13 18:04:09.000000000 +0100 +++ new/sysadmin/doc/CMakeLists.txt 2009-04-18 14:42:44.000000000 +0200 @@ -1 +1,6 @@ add_subdirectory(kiosktool) + + +if (LIBPARTED_FOUND AND UUID_FOUND AND BLKID_FOUND) + add_subdirectory(partitionmanager) +endif (LIBPARTED_FOUND AND UUID_FOUND AND BLKID_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/CMakeLists.txt new/sysadmin/kiosktool/CMakeLists.txt --- old/sysadmin/kiosktool/CMakeLists.txt 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/CMakeLists.txt 2010-03-11 17:06:29.000000000 +0100 @@ -8,6 +8,8 @@ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +set (KDE_DEFAULT_HOME ".kde${_KDE_DEFAULT_HOME_POSTFIX}" CACHE STRING "The default KDE home directory" ) +configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) set ( kiosktool_SRCS component.cpp @@ -50,7 +52,6 @@ set ( kconfigraweditor_SRCS kconfigraweditortest.cpp - kconfigraweditor.cpp ) kde4_add_executable(kconfigraweditortest ${kconfigraweditor_SRCS}) target_link_libraries(kconfigraweditortest ${KDE4_KDECORE_LIBS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/config.h.cmake new/sysadmin/kiosktool/config.h.cmake --- old/sysadmin/kiosktool/config.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/sysadmin/kiosktool/config.h.cmake 2010-03-10 19:49:30.000000000 +0100 @@ -0,0 +1 @@ +#cmakedefine KDE_DEFAULT_HOME "${KDE_DEFAULT_HOME}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/data/general.kiosk new/sysadmin/kiosktool/data/general.kiosk --- old/sysadmin/kiosktool/data/general.kiosk 2009-03-02 00:26:49.000000000 +0100 +++ new/sysadmin/kiosktool/data/general.kiosk 2010-03-11 22:16:33.000000000 +0100 @@ -89,5 +89,3 @@ Group=General Name=KDE Widget Style Description=Set the system wide widget style to the following style. -DefaultValue=motif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/data/themes.kiosk new/sysadmin/kiosktool/data/themes.kiosk --- old/sysadmin/kiosktool/data/themes.kiosk 2009-03-02 00:26:49.000000000 +0100 +++ new/sysadmin/kiosktool/data/themes.kiosk 2010-03-11 22:16:33.000000000 +0100 @@ -34,5 +34,3 @@ Group=General Name=Default KDE Widget Style Description=Set the system wide widget style to the following style. -DefaultValue=motif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/kconfigraweditor.cpp new/sysadmin/kiosktool/kconfigraweditor.cpp --- old/sysadmin/kiosktool/kconfigraweditor.cpp 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/kconfigraweditor.cpp 2010-03-11 22:20:45.000000000 +0100 @@ -1,8 +1,17 @@ #include "kconfigraweditor.h" +#include <unistd.h> + #include <QFile> #include <QTextStream> +#include <krandom.h> +#include <kstandarddirs.h> + +#ifndef KCONFIGRAWEDITORTEST +#include "kioskrun.h" +#endif + KConfigRawEditor::KConfigEntryData::KConfigEntryData( const QString &_value, DataType _type ) { value = _value; @@ -99,7 +108,13 @@ bool KConfigRawEditor::save() { +#ifdef KCONFIGRAWEDITORTEST QFile configFile( m_configFile ); +#else + QString localFile = ::KStandardDirs::locateLocal("tmp", "kiosktoolconfigfile_"+KRandom::randomString(5)); + ::unlink(QFile::encodeName(localFile)); + QFile configFile( localFile ); +#endif if( configFile.open( QIODevice::WriteOnly ) ) { @@ -149,6 +164,13 @@ else return false; + configFile.close(); +#ifndef KCONFIGRAWEDITORTEST + // install the file to the right location with the right owner + if( !KioskRun::self()->install( localFile, m_configFile )) + return false; +#endif + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/kconfigraweditortest.cpp new/sysadmin/kiosktool/kconfigraweditortest.cpp --- old/sysadmin/kiosktool/kconfigraweditortest.cpp 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/kconfigraweditortest.cpp 2010-03-11 17:06:29.000000000 +0100 @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307, USA. */ - #include "kconfigraweditor.h" + #define KCONFIGRAWEDITORTEST + #include "kconfigraweditor.cpp" #include <qdebug.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/kioskgui.cpp new/sysadmin/kiosktool/kioskgui.cpp --- old/sysadmin/kiosktool/kioskgui.cpp 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/kioskgui.cpp 2010-03-11 18:13:35.000000000 +0100 @@ -17,6 +17,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307, USA. */ + +#include <config.h> + #include "kioskgui.h" #include <QDir> @@ -67,7 +70,7 @@ : KXmlGuiWindow(), m_profileSelectionPage(0), m_componentSelectionPage(0), m_componentPage(0), m_profileAssignPage(0), m_profilePropsPage(0), m_data(0), - m_profile(0), m_componentData(0),m_page(0) + m_profile(0), m_componentData(0),m_page(PAGE_PROFILE_SELECTION) { m_run = new KioskRun(this); m_view = new MainView(this); @@ -94,7 +97,7 @@ m_profile = config.readEntry("CurrentProfile", "default"); m_component = config.readEntry("CurrentComponent"); - selectPage(PAGE_PROFILE_SELECTION, true); + selectPage(PAGE_PROFILE_SELECTION); QTimer::singleShot(0, this, SLOT(slotCheckEtcSkel())); @@ -107,7 +110,7 @@ void KioskGui::slotCheckEtcSkel() { - QString etcSkel = "/etc/skel/.kde"; + QString etcSkel = "/etc/skel/" KDE_DEFAULT_HOME; KioskSync skelDir; skelDir.addDir(etcSkel, KUrl()); QStringList skelFiles = skelDir.listFiles(); @@ -180,17 +183,17 @@ void KioskGui::slotAddProfile() { - selectPage(PAGE_PROFILE_NEW, true); + selectPage(PAGE_PROFILE_NEW); } void KioskGui::slotProfileProperties() { - selectPage(PAGE_PROFILE_PROPS, true); + selectPage(PAGE_PROFILE_PROPS); } void KioskGui::slotProfileSetup() { - selectPage(PAGE_COMPONENT_SELECTION, true); + selectPage(PAGE_COMPONENT_SELECTION); } void KioskGui::slotDeleteProfile(QTreeWidgetItem *item) @@ -221,16 +224,51 @@ void KioskGui::slotManageUsers() { - selectPage(PAGE_PROFILE_ASSIGN, true); + selectPage(PAGE_PROFILE_ASSIGN); } -void KioskGui::selectPage(int page, bool save) +void KioskGui::selectPage(Page page) { - if (save && !savePage( m_page )) - return; + if( m_page == PAGE_COMPONENT_SELECTION ) + { + m_component = m_componentSelectionPage->currentComponent(); + m_componentData = m_data->m_componentData[m_component]; + if (!m_componentData) + return; + } + if( m_page == PAGE_PROFILE_SELECTION && m_profileSelectionPage ) + { + m_profile = m_profileSelectionPage->listProfile->currentItem() ? + m_profileSelectionPage->listProfile->currentItem()->text(0) : QString(); + + KConfigGroup config( KGlobal::config(), "General"); + config.writeEntry("CurrentProfile", m_profile); + config.sync(); + + QString description; + QString installDir; + QString installUser; + + KioskRun::self()->getProfileInfo(m_profile, description, installDir, installUser); + + QStringList kdeDirs; + kdeDirs << installDir; + m_run->setKdeDirs(kdeDirs); + m_run->setUser(installUser); + } + if( m_page == PAGE_PROFILE_NEW ) + { + m_profile = m_profilePropsPage->profile(); + } + if( m_page == PAGE_PROFILE_PROPS ) + { + m_profile = m_profilePropsPage->profile(); + } + m_page = page; - if (( page == PAGE_PROFILE_SELECTION) && !m_profileSelectionPage) + + if (( m_page == PAGE_PROFILE_SELECTION) && !m_profileSelectionPage) { m_profileSelectionPage = new ProfileSelectionPageUI(m_view->widgetStack); connect(m_profileSelectionPage->buttonDelete, SIGNAL(clicked()), @@ -247,7 +285,7 @@ m_pageMapping[PAGE_PROFILE_SELECTION] = m_view->widgetStack->insertWidget(PAGE_PROFILE_SELECTION,m_profileSelectionPage); m_profileSelectionPage->listProfile->setFocus(); } - else if ((page == PAGE_COMPONENT_SELECTION) && !m_componentSelectionPage) + else if ((m_page == PAGE_COMPONENT_SELECTION) && !m_componentSelectionPage) { m_data = new KioskData; if (!m_data->load()) @@ -256,13 +294,13 @@ } m_componentSelectionPage = new ComponentSelectionPage(m_data, m_view->widgetStack); - connect(m_componentSelectionPage, SIGNAL(componentActivated()), this, SLOT(slotCompenentSelection())); + connect(m_componentSelectionPage, SIGNAL(componentActivated()), this, SLOT(slotComponentSelection())); m_componentSelectionPage->setCurrentComponent(m_component); m_pageMapping[PAGE_COMPONENT_SELECTION] = m_view->widgetStack->insertWidget(PAGE_COMPONENT_SELECTION, m_componentSelectionPage); m_componentSelectionPage->listComponent->setFocus(); } - else if (page == PAGE_PROFILE_NEW) + else if (m_page == PAGE_PROFILE_NEW) { delete m_profilePropsPage; m_profilePropsPage = new ProfilePropsPage(m_view->widgetStack, QString() ); @@ -270,7 +308,7 @@ m_pageMapping[PAGE_PROFILE_NEW] = m_view->widgetStack->insertWidget(PAGE_PROFILE_NEW,m_profilePropsPage->widget()); m_profilePropsPage->setFocus(); } - else if (page == PAGE_PROFILE_PROPS) + else if (m_page == PAGE_PROFILE_PROPS) { delete m_profilePropsPage; m_profilePropsPage = new ProfilePropsPage(m_view->widgetStack, m_profile); @@ -278,14 +316,14 @@ m_pageMapping[PAGE_PROFILE_PROPS] = m_view->widgetStack->insertWidget(PAGE_PROFILE_PROPS,m_profilePropsPage->widget()); m_profilePropsPage->setFocus(); } - else if ((page == PAGE_PROFILE_ASSIGN) && !m_profileAssignPage) + else if ((m_page == PAGE_PROFILE_ASSIGN) && !m_profileAssignPage) { m_profileAssignPage = new UserManagementPage(m_view->widgetStack); m_pageMapping[PAGE_PROFILE_ASSIGN] = m_view->widgetStack->insertWidget(PAGE_PROFILE_ASSIGN,m_profileAssignPage->widget()); m_profileAssignPage->setFocus(); } - else if (page == PAGE_COMPONENT) + else if (m_page == PAGE_COMPONENT) { delete m_componentPage; @@ -306,37 +344,37 @@ m_componentPage->setFocus(); } - if( page == PAGE_PROFILE_SELECTION ) + if( m_page == PAGE_PROFILE_SELECTION ) { setSubCaption(i18n("Main Menu")); setMainCaption(i18n("Main Menu")); } - if( page == PAGE_PROFILE_NEW ) + if( m_page == PAGE_PROFILE_NEW ) { setSubCaption(i18n("Add New Profile")); setMainCaption(i18n("Add New Profile")); } - if( page == PAGE_PROFILE_PROPS ) + if( m_page == PAGE_PROFILE_PROPS ) { setSubCaption(i18n("Profile Properties")); setMainCaption(i18n("Profile Properties")); } - if( page == PAGE_COMPONENT_SELECTION ) + if( m_page == PAGE_COMPONENT_SELECTION ) { setSubCaption(i18n("Setup Profile \"%1\"",m_profile)); setMainCaption(i18n("Setup Profile")); } - if( page == PAGE_COMPONENT ) + if( m_page == PAGE_COMPONENT ) { setSubCaption(m_componentPage->subCaption()); } - if( page == PAGE_PROFILE_ASSIGN ) + if( m_page == PAGE_PROFILE_ASSIGN ) { setSubCaption(i18n("Assign Profiles")); } - m_view->widgetStack->setCurrentIndex(m_pageMapping[page]); - loadPage(page); + m_view->widgetStack->setCurrentIndex(m_pageMapping[m_page]); + loadPage(m_page); updateButtons(); } @@ -420,7 +458,7 @@ m_profileSelectionPage->listProfile->setCurrentItem(m_profileSelectionPage->listProfile->topLevelItem(0)); } -void KioskGui::loadPage(int page) +void KioskGui::loadPage(Page page) { if( page == PAGE_PROFILE_SELECTION ) { @@ -444,35 +482,10 @@ } } -bool KioskGui::savePage(int page) +bool KioskGui::savePage(Page page) { - if( page == PAGE_PROFILE_SELECTION ) - { - m_profile = m_profileSelectionPage->listProfile->currentItem() ? - m_profileSelectionPage->listProfile->currentItem()->text(0) : QString(); - - KConfigGroup config( KGlobal::config(), "General"); - config.writeEntry("CurrentProfile", m_profile); - config.sync(); - - QString description; - QString installDir; - QString installUser; - - KioskRun::self()->getProfileInfo(m_profile, description, installDir, installUser); - - QStringList kdeDirs; - kdeDirs << installDir; - m_run->setKdeDirs(kdeDirs); - m_run->setUser(installUser); - } if( page == PAGE_COMPONENT_SELECTION) { - m_component = m_componentSelectionPage->currentComponent(); - m_componentData = m_data->m_componentData[m_component]; - if (!m_componentData) - return false; - return m_componentSelectionPage->save(); } if( page == PAGE_COMPONENT ) @@ -484,7 +497,6 @@ { if (m_profilePropsPage) { - m_profile = m_profilePropsPage->profile(); return m_profilePropsPage->save(); } } @@ -492,7 +504,6 @@ { if (m_profilePropsPage) { - m_profile = m_profilePropsPage->profile(); return m_profilePropsPage->save(); } } @@ -506,19 +517,25 @@ void KioskGui::finishedPage(bool save) { + if( save ) + { + if( !savePage( m_page )) + return; + } if (m_page == PAGE_PROFILE_NEW) - selectPage(PAGE_PROFILE_SELECTION, save); + selectPage(PAGE_PROFILE_SELECTION); else if (m_page == PAGE_PROFILE_PROPS) - selectPage(PAGE_PROFILE_SELECTION, save); + selectPage(PAGE_PROFILE_SELECTION); else if (m_page == PAGE_PROFILE_ASSIGN) - selectPage(PAGE_PROFILE_SELECTION, save); - else if (m_page == PAGE_COMPONENT_SELECTION && !save) + selectPage(PAGE_PROFILE_SELECTION); + else if (m_page == PAGE_COMPONENT_SELECTION) { - m_componentSelectionPage->discard(); - selectPage(m_page - 1, save); + if( !save ) + m_componentSelectionPage->discard(); + selectPage(PAGE_PROFILE_SELECTION); } - else if (m_page > 1) - selectPage(m_page - 1, save); + else if (m_page == PAGE_COMPONENT) + selectPage(PAGE_COMPONENT_SELECTION); } void KioskGui::discardPage() @@ -526,9 +543,9 @@ finishedPage(false); } -void KioskGui::slotCompenentSelection() +void KioskGui::slotComponentSelection() { - selectPage(PAGE_COMPONENT, true); + selectPage(PAGE_COMPONENT); } void KioskGui::slotConfig() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/kioskgui.h new/sysadmin/kiosktool/kioskgui.h --- old/sysadmin/kiosktool/kioskgui.h 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/kioskgui.h 2010-03-11 18:13:35.000000000 +0100 @@ -59,7 +59,7 @@ { Q_OBJECT public: - enum { PAGE_PROFILE_SELECTION = 1, + enum Page { PAGE_PROFILE_SELECTION = 1, PAGE_COMPONENT_SELECTION = 2, PAGE_COMPONENT = 3, PAGE_PROFILE_NEW = 4, @@ -74,9 +74,9 @@ void saveProperties(KConfigGroup &config); void readProperties(const KConfigGroup &config); - void selectPage(int page, bool save); - void loadPage(int page); - bool savePage(int page); + void selectPage(Page page); + void loadPage(Page page); + bool savePage(Page page); void loadProfiles(); @@ -90,7 +90,7 @@ void slotProfileSetup(); void slotManageUsers(); void slotConfig(); - void slotCompenentSelection(); + void slotComponentSelection(); void uploadAllProfiles(); void uploadCurrentProfile(); @@ -121,8 +121,8 @@ ComponentData * m_componentData; KAction *m_uploadAction; KToggleAction *m_backgroundAction; - QMap<int,int> m_pageMapping; - int m_page; + QMap<Page,int> m_pageMapping; + Page m_page; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/kioskrun.cpp new/sysadmin/kiosktool/kioskrun.cpp --- old/sysadmin/kiosktool/kioskrun.cpp 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/kioskrun.cpp 2010-03-11 23:46:04.000000000 +0100 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307, USA. */ +#include <config.h> + #include "kioskrun.h" @@ -25,6 +27,7 @@ #include <stdlib.h> #include <sys/stat.h> #include <sys/types.h> +#include <unistd.h> #include <QDir> #include <QFile> @@ -53,6 +56,7 @@ #include "kconfigraweditor.h" #include <kio/job.h> +#include <kio/jobuidelegate.h> #include <kio/copyjob.h> #include <kio/deletejob.h> @@ -63,8 +67,8 @@ KioskRun *KioskRun::s_self = 0; -KioskRun::KioskRun( QObject* parent ) - : QObject(parent), m_instance(0), m_localKdercConfig(0) +KioskRun::KioskRun( QWidget* parent ) + : QObject(parent), m_instance(0), m_localKdercConfig(0), m_mainWidget( parent ) { m_noRestrictions = false; m_forceSycocaUpdate = false; @@ -163,6 +167,7 @@ Q_ASSERT(dir.startsWith(m_homeDir)); KIO::DeleteJob *deleteJob = KIO::del( KUrl(dir) ); + deleteJob->ui()->setWindow( m_mainWidget ); deleteJob->exec(); } @@ -170,8 +175,8 @@ KioskRun::applyEnvironment(KProcess *p) { p->setEnv(QLatin1String("HOME"), m_homeDir); - p->setEnv(QLatin1String("KDEHOME"), QString(m_homeDir + "/.kde") ); - p->setEnv(QLatin1String("KDEROOTHOME"), QString( m_homeDir + "/.kde")); + p->setEnv(QLatin1String("KDEHOME"), QString(m_homeDir + "/" KDE_DEFAULT_HOME) ); + p->setEnv(QLatin1String("KDEROOTHOME"), QString( m_homeDir + "/" KDE_DEFAULT_HOME)); p->setEnv(QLatin1String("KDEDIRS"), m_kdeDirs.join(":")); p->setEnv(QLatin1String("XDG_DATA_HOME"), QString( m_homeDir + "/.local/share")); p->setEnv(QLatin1String("XDG_DATA_DIRS"), m_xdgDataDirs.join(":")); @@ -257,7 +262,7 @@ QString newSocketDir = ::KStandardDirs::locateLocal("socket", "kioskdir"); SetEnv home("HOME", m_homeDir); - QString kdeHome = m_homeDir+"/.kde"; + QString kdeHome = m_homeDir+"/" KDE_DEFAULT_HOME; SetEnv kdehome("KDEHOME", kdeHome); SetEnv kderoothome("KDEROOTHOME", kdeHome); SetEnv kdedirs("KDEDIRS", m_kdeDirs.join(":")); @@ -284,7 +289,7 @@ ::mkdir(QFile::encodeName(newSocketDir), 0700); ::symlink(QFile::encodeName(newSocketDir), QFile::encodeName(socketDir)); - m_configDir = QString("%1/.kde/share/config/").arg(m_homeDir); + m_configDir = QString("%1/" KDE_DEFAULT_HOME "/share/config/").arg(m_homeDir); m_instance = new KComponentData("kioskrun"); (void) m_instance->dirs(); // Create KStandardDirs obj @@ -727,7 +732,7 @@ char hostname[256]; hostname[0] = 0; gethostname(hostname, 255); - QString cacheDir = QString("%1/.kde/cache-%2").arg(m_homeDir).arg(hostname); + QString cacheDir = QString("%1/" KDE_DEFAULT_HOME "/cache-%2").arg(m_homeDir).arg(hostname); deleteDir(cacheDir); KStandardDirs::makeDir(cacheDir); @@ -875,10 +880,12 @@ } KIO::StatJob *existsJob = KIO::stat( dest, KIO::HideProgressInfo ); + existsJob->ui()->setWindow( m_mainWidget ); if ( existsJob->exec() == true ) return true; KIO::SimpleJob *mkdirJob = KIO::mkdir(dest, 0755 ); + mkdirJob->ui()->setWindow( m_mainWidget ); if (mkdirJob->exec() == true) return true; @@ -890,12 +897,14 @@ KioskRun::createRemoteDirRecursive(const KUrl &dest, bool ask) { KIO::StatJob *existsJob = KIO::stat( dest, KIO::HideProgressInfo ); + existsJob->ui()->setWindow( m_mainWidget ); if ( existsJob->exec() == true ) return true; KUrl parent = parent.upUrl(); KIO::StatJob *parentExistsJob = KIO::stat( parent, KIO::HideProgressInfo ); + parentExistsJob->ui()->setWindow( m_mainWidget ); if ( parentExistsJob->exec() == true ) { return createRemoteDir(dest); @@ -928,10 +937,12 @@ KioskRun::createRemoteDir(const KUrl &dest) { KIO::StatJob *existsJob = KIO::stat( dest, KIO::HideProgressInfo ); + existsJob->ui()->setWindow( m_mainWidget ); if ( existsJob->exec() == true ) return true; KIO::SimpleJob *mkdirJob = KIO::mkdir(dest, 0755 ); + mkdirJob->ui()->setWindow( m_mainWidget ); if (mkdirJob->exec() == true) return true; @@ -956,10 +967,11 @@ KUrl src; src.setPath(file); - KIO::CopyJob *result = KIO::copy(src, dest, KIO::Overwrite|KIO::HideProgressInfo ); + KIO::FileCopyJob *result = KIO::file_copy(src, dest, 0644, KIO::Overwrite|KIO::HideProgressInfo ); + result->ui()->setWindow( m_mainWidget ); if (result->exec() == true) { - ::unlink(QFile::encodeName(file)); + ::unlink(QFile::encodeName(file)); return true; } @@ -973,6 +985,7 @@ KUrl src; src.setPath(file); KIO::CopyJob *result = KIO::copy(src, dest, KIO::Overwrite|KIO::HideProgressInfo ); + result->ui()->setWindow( m_mainWidget ); if ( result->exec() ) return true; return false; @@ -992,6 +1005,7 @@ dest.setPath(destination); KIO::DeleteJob *delJob = KIO::del(dest,KIO::HideProgressInfo ); + delJob->ui()->setWindow( m_mainWidget ); return delJob->exec(); } @@ -1020,6 +1034,7 @@ if (!createRemoteDirRecursive(dest.upUrl(), false)) return false; KIO::CopyJob *moveJob = KIO::move( src, dest, KIO::Overwrite|KIO::HideProgressInfo ); + moveJob->ui()->setWindow( m_mainWidget ); if ( !moveJob->exec() ) { return false; @@ -1089,6 +1104,7 @@ if (QFile::exists(settingsUrl.path())) { KIO::CopyJob *result = KIO::copy(settingsUrl, localCopyUrl, KIO::Overwrite|KIO::HideProgressInfo ); + result->ui()->setWindow( m_mainWidget ); if( result->exec() == false ) return 0; } @@ -1194,7 +1210,9 @@ newProfileGroup.writeEntry("Description", description); newProfileGroup.writeEntry("InstallUser", installUser); newProfileGroup.sync(); + m_user = installUser; bool result = install(localProfileInfo, saveProfileInfo); + m_user = QString(); if (!result) return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/kioskrun.h new/sysadmin/kiosktool/kioskrun.h --- old/sysadmin/kiosktool/kioskrun.h 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/kioskrun.h 2010-03-11 23:04:40.000000000 +0100 @@ -170,7 +170,7 @@ bool uploadRemote(const QString &file, const KUrl &dest); protected: - KioskRun( QObject* parent = 0 ); + KioskRun( QWidget* parent = 0 ); ~KioskRun(); bool setupRuntimeEnv(); @@ -205,6 +205,7 @@ QString m_kderc; QString m_localKderc; KConfig *m_localKdercConfig; + QWidget* m_mainWidget; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/kiosktool.desktop new/sysadmin/kiosktool/kiosktool.desktop --- old/sysadmin/kiosktool/kiosktool.desktop 2009-04-13 22:09:06.000000000 +0200 +++ new/sysadmin/kiosktool/kiosktool.desktop 2010-02-24 12:42:08.000000000 +0100 @@ -9,11 +9,15 @@ Name[ar]=أداة الإدارة Kiosk Name[be]=Утыліта адміністравання Kiosk Name[bg]=Администриране на Киоск +Name[ca]=Eina d'administració del Kiosk +Name[ca@valencia]=Eina d'administració del Kiosk Name[cs]=Administrační nástroj Kiosk Name[csb]=Nôrzãdze sprôwnika Kiosk Name[da]=Kiosk administrationsværktøj Name[de]=Kiosk-Administration (Werkzeug) Name[el]=Εργαλείο διαχείρισης Kiosk +Name[en_GB]=Kiosk Admin Tool +Name[eo]=Kiosk Administrilo Name[es]=Herramienta de administración de Kiosk Name[et]=Kioski haldur Name[fr]=Outil d'administration Kiosk @@ -22,6 +26,9 @@ Name[gu]=કિઓસ્ક એડમિન સાધન Name[hi]=कियॉस्क एडमिन औजार Name[hne]=कियास्क एडमिन औजार +Name[hr]=Administracijski alat Kiosk +Name[hu]=Kiosk Admin Eszköz +Name[it]=Strumento di amministrazione Kiosk Name[ja]=Kiosk 管理者用ツール Name[km]=ឧបករណ៍ Admin របស់ Kiosk Name[ko]=Kiosk 관리자 도구 @@ -29,6 +36,8 @@ Name[lt]=Kiosk administravimo įrankis Name[lv]=Kiosk administrēšanas rīks Name[ml]=കിയോസ്കിന്റെ ഭരണാധികാരത്തിനുള്ള ഉപകരണം +Name[ms]=Alatan Pentadbir Kiosk +Name[nb]=Kiosk administrasjonsverktøy Name[nds]=Pleegwarktüüch för den Kioskbedrief Name[nl]=Kiosk-administratiehulpmiddel Name[nn]=Kiosk administreringsverktøy @@ -38,6 +47,11 @@ Name[pt_BR]=Ferramenta de administração Kiosk Name[ro]=Instrument de administrare Kiosk Name[ru]=Программа администрирования Kiosk +Name[sk]=Kiosk administrátorský nástroj +Name[sr]=Киоск, администраторска алатка +Name[sr@ijekavian]=Киоск, администраторска алатка +Name[sr@ijekavianlatin]=Kiosk, administratorska alatka +Name[sr@latin]=Kiosk, administratorska alatka Name[sv]=Kiosk-administreringsverktyg Name[tg]=Мудири киоск Name[th]=เครื่องมือบริหารระบบ Kiosk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/main.cpp new/sysadmin/kiosktool/main.cpp --- old/sysadmin/kiosktool/main.cpp 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/main.cpp 2010-03-10 11:46:23.000000000 +0100 @@ -29,7 +29,7 @@ bool kde_kiosk_exception = false; #ifndef KDERC -#define KDERC "/etc/kderc" +#define KDERC "/etc/kde4rc" #endif int main(int argc, char *argv[]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/userManagement.cpp new/sysadmin/kiosktool/userManagement.cpp --- old/sysadmin/kiosktool/userManagement.cpp 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/userManagement.cpp 2010-03-11 22:23:42.000000000 +0100 @@ -38,9 +38,6 @@ #include "kioskrun.h" - -#define AVAILABLE_SINCE "KDE 3.2.3" - UserManagementPage::UserManagementPage(QWidget* parent) : UserManagementUI(parent), m_widget(this) { @@ -57,32 +54,12 @@ connect(listGroups, SIGNAL(itemSelectionChanged()), this, SLOT(slotUpdateButtons())); connect(listUsers, SIGNAL(itemSelectionChanged()), this, SLOT(slotUpdateButtons())); - - static bool firstTime = true; - - if (firstTime) - { - firstTime = false; - QTimer::singleShot(0, this, SLOT(slotShowNotice())); - } } UserManagementPage::~UserManagementPage() { } -void UserManagementPage::slotShowNotice() -{ - KMessageBox::information(this, - i18n("<qt>The profiles that you define here are automatically applied when the " - "user logs in to %1 or newer." - "If you want to use these profiles in combination with older versions you need " - "to manually set the $KDEDIRS environment variable from the startkde " - "script by adding the following line: " - "export KDEDIRS=$(kiosktool-kdedirs) ",QString(AVAILABLE_SINCE)), - i18n("Attention"), "user-profiles"); -} - void UserManagementPage::load() { listGroups->clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysadmin/kiosktool/userManagement.h new/sysadmin/kiosktool/userManagement.h --- old/sysadmin/kiosktool/userManagement.h 2009-04-16 22:04:31.000000000 +0200 +++ new/sysadmin/kiosktool/userManagement.h 2010-03-11 22:23:42.000000000 +0100 @@ -78,7 +78,6 @@ void slotDeleteUser(); void slotUpdateButtons(); - void slotShowNotice(); private: UserManagementUI *w; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 koffice2 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package koffice2 for openSUSE:Factory checked in at Thu Apr 1 18:14:31 CEST 2010. -------- --- KDE/koffice2/koffice2-doc.changes 2010-03-01 18:01:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/koffice2/koffice2-doc.changes 2010-04-01 18:14:02.474708000 +0200 @@ -1,0 +2,10 @@ +Wed Mar 31 14:12:47 UTC 2010 - wstephenson(a)novell.com + +- update to KOffice 2.1.2 bugfix release + +------------------------------------------------------------------- +Wed Mar 10 09:51:51 UTC 2010 - wstephenson(a)suse.de + +- Add patch for bko#218129 - cannot select predefined smudge brush + +------------------------------------------------------------------- koffice2.changes: same change calling whatdependson for head-i586 Old: ---- gcc-45.diff koffice-2.1.1.tar.bz2 New: ---- koffice-2.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice2-doc.spec ++++++ --- /var/tmp/diff_new_pack.b9nbcH/_old 2010-04-01 18:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.b9nbcH/_new 2010-04-01 18:14:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package koffice2-doc (Version 2.1.1) +# spec file for package koffice2-doc (Version 2.1.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,8 @@ Group: Productivity/Office/Suite Summary: Documentation of the KDE Office Suite Url: http://www.koffice.org -Version: 2.1.1 -Release: 4 +Version: 2.1.2 +Release: 1 Source0: koffice-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ koffice2.spec ++++++ --- /var/tmp/diff_new_pack.b9nbcH/_old 2010-04-01 18:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.b9nbcH/_new 2010-04-01 18:14:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package koffice2 (Version 2.1.1) +# spec file for package koffice2 (Version 2.1.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,12 +33,11 @@ Group: Productivity/Office/Suite Summary: Libraries and Base Files for the KDE Office Suite Url: http://www.koffice.org -Version: 2.1.1 -Release: 4 +Version: 2.1.2 +Release: 1 Source0: koffice-%version.tar.bz2 Patch1: koffice_remove_kohyphen.diff Patch2: koffice_remove_python_shebangs.diff -Patch3: gcc-45.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -64,7 +63,6 @@ %setup -q -n koffice-%version #%patch1 #%patch2 -%patch3 %build %cmake_kde4 -d build ++++++ koffice-2.1.1.tar.bz2 -> koffice-2.1.2.tar.bz2 ++++++ KDE/koffice2/koffice-2.1.1.tar.bz2 /mounts/work_src_done/STABLE/koffice2/koffice-2.1.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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