May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kdeadmin4 for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package kdeadmin4 for openSUSE:Factory checked in at Wed May 6 18:42:20 CEST 2009. -------- --- KDE/kdeadmin4/kdeadmin4.changes 2009-03-27 00:37:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeadmin4/kdeadmin4.changes 2009-04-30 21:03:10.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 21:02:56 CEST 2009 - dmueller(a)suse.de + +- update to 4.2.3 + * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdeadmin-4.2.2.tar.bz2 New: ---- kdeadmin-4.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeadmin4.spec ++++++ --- /var/tmp/diff_new_pack.n11754/_old 2009-05-06 18:42:13.000000000 +0200 +++ /var/tmp/diff_new_pack.n11754/_new 2009-05-06 18:42:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeadmin4 (Version 4.2.2) +# spec file for package kdeadmin4 (Version 4.2.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ Summary: kdeadmin base package %define with_kpackage 0%{opensuse_bs} Url: http://www.kde.org -Version: 4.2.2 +Version: 4.2.3 Release: 1 Source0: kdeadmin-%version.tar.bz2 Source1: _upstream @@ -219,6 +219,9 @@ %doc COPYING COPYING.DOC README %changelog +* Thu Apr 30 2009 dmueller(a)suse.de +- update to 4.2.3 + * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php * Fri Mar 27 2009 dmueller(a)suse.de - update to 4.2.2 * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php @@ -246,7 +249,7 @@ - update to 4.0.99 * Fri Jul 11 2008 dmueller(a)suse.de - update to 4.0.98 -* Thu Jul 03 2008 dmueller(a)suse.de +* Fri Jul 04 2008 dmueller(a)suse.de - update to 4.0.85 * Thu Jun 26 2008 dmueller(a)suse.de - update to 4.0.84 ++++++ kdeadmin-4.2.2.tar.bz2 -> kdeadmin-4.2.3.tar.bz2 ++++++ Files old/kdeadmin-4.2.2/doc/kcontrol/knetworkconf/index.cache.bz2 and new/kdeadmin-4.2.3/doc/kcontrol/knetworkconf/index.cache.bz2 differ Files old/kdeadmin-4.2.2/doc/kcron/index.cache.bz2 and new/kdeadmin-4.2.3/doc/kcron/index.cache.bz2 differ Files old/kdeadmin-4.2.2/doc/kdat/index.cache.bz2 and new/kdeadmin-4.2.3/doc/kdat/index.cache.bz2 differ Files old/kdeadmin-4.2.2/doc/kpackage/index.cache.bz2 and new/kdeadmin-4.2.3/doc/kpackage/index.cache.bz2 differ Files old/kdeadmin-4.2.2/doc/ksystemlog/index.cache.bz2 and new/kdeadmin-4.2.3/doc/ksystemlog/index.cache.bz2 differ Files old/kdeadmin-4.2.2/doc/ksysv/index.cache.bz2 and new/kdeadmin-4.2.3/doc/ksysv/index.cache.bz2 differ Files old/kdeadmin-4.2.2/doc/kuser/index.cache.bz2 and new/kdeadmin-4.2.3/doc/kuser/index.cache.bz2 differ Files old/kdeadmin-4.2.2/doc/lilo-config/index.cache.bz2 and new/kdeadmin-4.2.3/doc/lilo-config/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.2.2/kcron/src/kcm_cron.desktop new/kdeadmin-4.2.3/kcron/src/kcm_cron.desktop --- old/kdeadmin-4.2.2/kcron/src/kcm_cron.desktop 2009-03-26 15:43:48.000000000 +0100 +++ new/kdeadmin-4.2.3/kcron/src/kcm_cron.desktop 2009-04-30 11:13:14.000000000 +0200 @@ -43,6 +43,7 @@ Name[ro]=Planificator de procese Name[ru]=Планировщик задач Name[se]=Bargoplánejeaddji +Name[sl]=Razporejevalnik opravil Name[sv]=Jobbschemaläggare Name[th]=ตัวจัดการตารางงาน Name[tr]=Görev Zamanlayıcı @@ -81,6 +82,7 @@ Comment[pt_BR]=Configurar e agendar tarefas Comment[ro]=Configurează și planifică sarcinile Comment[ru]=Настроить и запланировать задачу +Comment[sl]=Nastavite in razporedite opravila Comment[sv]=Anpassa och schemalägg jobb Comment[th]=ปรับแต่งและจัดตารางงาน Comment[tr]=Görevleri zamanla ve yapılandır diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.2.2/knetworkconf/backends/CMakeLists.txt new/kdeadmin-4.2.3/knetworkconf/backends/CMakeLists.txt --- old/kdeadmin-4.2.2/knetworkconf/backends/CMakeLists.txt 2008-01-05 00:58:33.000000000 +0100 +++ new/kdeadmin-4.2.3/knetworkconf/backends/CMakeLists.txt 2009-04-30 11:13:14.000000000 +0200 @@ -15,7 +15,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/service-list.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/service-list.pl @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/util.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/util.pl @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/xml.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/xml.pl @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/system-tools-backends.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/system-tools-backends.pc ) +#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/system-tools-backends.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/system-tools-backends.pc ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/network-conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/network-conf @ONLY) macro_additional_clean_files( @@ -32,11 +32,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/service-list.pl ${CMAKE_CURRENT_BINARY_DIR}/util.pl ${CMAKE_CURRENT_BINARY_DIR}/xml.pl - ${CMAKE_CURRENT_BINARY_DIR}/system-tools-backends.pc + #${CMAKE_CURRENT_BINARY_DIR}/system-tools-backends.pc ${CMAKE_CURRENT_BINARY_DIR}/network-conf ) -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/system-tools-backends.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) +#install( FILES ${CMAKE_CURRENT_BINARY_DIR}/system-tools-backends.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/debug.pl ${CMAKE_CURRENT_BINARY_DIR}/file.pl ${CMAKE_CURRENT_BINARY_DIR}/general.pl ${CMAKE_CURRENT_BINARY_DIR}/network.pl ${CMAKE_CURRENT_BINARY_DIR}/parse.pl ${CMAKE_CURRENT_BINARY_DIR}/platform.pl ${CMAKE_CURRENT_BINARY_DIR}/process.pl ${CMAKE_CURRENT_BINARY_DIR}/replace.pl ${CMAKE_CURRENT_BINARY_DIR}/report.pl ${CMAKE_CURRENT_BINARY_DIR}/service.pl ${CMAKE_CURRENT_BINARY_DIR}/service-list.pl ${CMAKE_CURRENT_BINARY_DIR}/util.pl ${CMAKE_CURRENT_BINARY_DIR}/xml.pl ${CMAKE_CURRENT_BINARY_DIR}/network-conf DESTINATION ${DATA_INSTALL_DIR}/knetworkconf/backends) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.2.2/ksystemlog/src/ksystemlog.desktop new/kdeadmin-4.2.3/ksystemlog/src/ksystemlog.desktop --- old/kdeadmin-4.2.2/ksystemlog/src/ksystemlog.desktop 2009-03-26 15:43:48.000000000 +0100 +++ new/kdeadmin-4.2.3/ksystemlog/src/ksystemlog.desktop 2009-04-30 11:13:14.000000000 +0200 @@ -45,6 +45,7 @@ Comment[pt_BR]=Ferramenta de visualização de log Comment[ro]=Unealtă de vizualizare a jurnalelor de sistem Comment[ru]=Инструмент для просмотра системного журнала +Comment[sl]=Orodje za ogled sistemskih dnevnikov Comment[sv]=Visningsverktyg för systemloggar Comment[th]=เครื่องมือแสดงปูมบันทึกของระบบ Comment[tr]=Sistem günlük kayıtlarını gösterme aracı @@ -84,6 +85,7 @@ GenericName[pt_BR]=Visualizador de logs do sistema GenericName[ro]=Vizualizator jurnale de sistem GenericName[ru]=Средство просмотра системных журналов +GenericName[sl]=Prikazovalnik sistemskih dnevnikov GenericName[sv]=Visning av systemloggar GenericName[th]=แสดงปูมบันทึกของระบบ GenericName[tr]=Sistem Günlüğü İzleyici diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.2.2/ksystemlog/src/loggerDialog.cpp new/kdeadmin-4.2.3/ksystemlog/src/loggerDialog.cpp --- old/kdeadmin-4.2.2/ksystemlog/src/loggerDialog.cpp 2008-02-13 16:45:54.000000000 +0100 +++ new/kdeadmin-4.2.3/ksystemlog/src/loggerDialog.cpp 2009-04-30 11:13:14.000000000 +0200 @@ -93,6 +93,7 @@ break; } } + tag->setEnabled(false); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.desktop new/kdeadmin-4.2.3/system-config-printer-kde/system-config-printer-kde.desktop --- old/kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.desktop 2009-03-26 15:43:48.000000000 +0100 +++ new/kdeadmin-4.2.3/system-config-printer-kde/system-config-printer-kde.desktop 2009-04-30 11:13:14.000000000 +0200 @@ -27,6 +27,7 @@ Name[pt_BR]=Imprimindo Name[ro]=Imprimare Name[ru]=Печать +Name[sl]=Tiskanje Name[sv]=Utskrift Name[tr]=Yazdırma Name[uk]=Друк @@ -61,6 +62,7 @@ Comment[pt_BR]=Configurar impressoras Comment[ro]=Configurează imprimantele Comment[ru]=Настройка принтеров +Comment[sl]=Nastavite tiskalnike Comment[sv]=Anpassa skrivare Comment[tr]=Yazıcıları yapılandır Comment[uk]=Налаштувати принтери ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdeaccessibility4 for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package kdeaccessibility4 for openSUSE:Factory checked in at Wed May 6 18:42:00 CEST 2009. -------- --- KDE/kdeaccessibility4/kdeaccessibility4.changes 2009-03-27 00:37:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeaccessibility4/kdeaccessibility4.changes 2009-04-30 21:02:03.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 21:01:50 CEST 2009 - dmueller(a)suse.de + +- update to 4.2.3 + * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php + +------------------------------------------------------------------- kdeaccessibility4-icons.changes: same change calling whatdependson for head-i586 Old: ---- kdeaccessibility-4.2.2.tar.bz2 New: ---- kdeaccessibility-4.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeaccessibility4-icons.spec ++++++ --- /var/tmp/diff_new_pack.CM8647/_old 2009-05-06 18:41:50.000000000 +0200 +++ /var/tmp/diff_new_pack.CM8647/_new 2009-05-06 18:41:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeaccessibility4-icons (Version 4.2.2) +# spec file for package kdeaccessibility4-icons (Version 4.2.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Group: System/GUI/KDE Summary: Monochrome Icon Set for KDE Url: http://www.kde.org -Version: 4.2.2 +Version: 4.2.3 Release: 1 Source0: kdeaccessibility-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,6 +65,9 @@ /usr/share/icons/mono %changelog +* Thu Apr 30 2009 dmueller(a)suse.de +- update to 4.2.3 + * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php * Fri Mar 27 2009 dmueller(a)suse.de - update to 4.2.2 * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php @@ -94,9 +97,9 @@ - update to 4.0.99 * Tue Jul 15 2008 dmueller(a)suse.de - update to 4.0.98 -* Thu Jul 03 2008 dmueller(a)suse.de +* Fri Jul 04 2008 dmueller(a)suse.de - update to 4.0.85 -* Thu Jun 26 2008 dmueller(a)suse.de +* Fri Jun 27 2008 dmueller(a)suse.de - update to 4.0.84 * Wed Jun 18 2008 dmueller(a)suse.de - update to 4.0.83 ++++++ kdeaccessibility4.spec ++++++ --- /var/tmp/diff_new_pack.CM8647/_old 2009-05-06 18:41:50.000000000 +0200 +++ /var/tmp/diff_new_pack.CM8647/_new 2009-05-06 18:41:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeaccessibility4 (Version 4.2.2) +# spec file for package kdeaccessibility4 (Version 4.2.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: kdeaccessibility Base Package Url: http://www.kde.org -Version: 4.2.2 +Version: 4.2.3 Release: 1 Source0: kdeaccessibility-%version.tar.bz2 Source1: _upstream @@ -180,6 +180,9 @@ /usr/share/kde4/apps/color-schemes %changelog +* Thu Apr 30 2009 dmueller(a)suse.de +- update to 4.2.3 + * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php * Fri Mar 27 2009 dmueller(a)suse.de - update to 4.2.2 * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php @@ -209,9 +212,9 @@ - update to 4.0.99 * Tue Jul 15 2008 dmueller(a)suse.de - update to 4.0.98 -* Thu Jul 03 2008 dmueller(a)suse.de +* Fri Jul 04 2008 dmueller(a)suse.de - update to 4.0.85 -* Thu Jun 26 2008 dmueller(a)suse.de +* Fri Jun 27 2008 dmueller(a)suse.de - update to 4.0.84 * Wed Jun 18 2008 dmueller(a)suse.de - update to 4.0.83 ++++++ kdeaccessibility-4.2.2.tar.bz2 -> kdeaccessibility-4.2.3.tar.bz2 ++++++ KDE/kdeaccessibility4/kdeaccessibility-4.2.2.tar.bz2 /mounts/work_src_done/STABLE/kdeaccessibility4/kdeaccessibility-4.2.3.tar.bz2 differ: byte 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 kde4-filesystem for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package kde4-filesystem for openSUSE:Factory checked in at Wed May 6 18:41:33 CEST 2009. -------- --- KDE/kde4-filesystem/kde4-filesystem.changes 2009-04-05 15:49:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde4-filesystem/kde4-filesystem.changes 2009-04-30 21:09:05.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 30 21:08:48 CEST 2009 - dmueller(a)suse.de + +- bump to 4.2.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.lf6203/_old 2009-05-06 18:41:25.000000000 +0200 +++ /var/tmp/diff_new_pack.lf6203/_new 2009-05-06 18:41:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kde4-filesystem (Version 4.2.2) +# spec file for package kde4-filesystem (Version 4.2.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: kde4-filesystem Url: http://www.kde.org -Version: 4.2.2 -Release: 2 +Version: 4.2.3 +Release: 1 License: LGPL v2.1 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/GUI/KDE @@ -171,6 +171,8 @@ %endif %changelog +* Thu Apr 30 2009 dmueller(a)suse.de +- bump to 4.2.3 * Sun Apr 05 2009 beineri(a)opensuse.org - own /usr/share/doc/kde/HTML/<lang> (bnc#457911) * Fri Mar 27 2009 dmueller(a)suse.de ++++++ macros.kde4 ++++++ --- /var/tmp/diff_new_pack.lf6203/_old 2009-05-06 18:41:25.000000000 +0200 +++ /var/tmp/diff_new_pack.lf6203/_new 2009-05-06 18:41:25.000000000 +0200 @@ -5,9 +5,9 @@ %_kde_config_dir %{_kde_share_dir}/config %_kde_html_dir %{_prefix}/share/doc/kde/HTML -%_kde_platform_version 4.2.2 -%_kde_pimlibs_version 4.2.2 -%_kde_akonadi_version 1.1.1 +%_kde_platform_version 4.2.3 +%_kde_pimlibs_version 4.2.3 +%_kde_akonadi_version 1.1.2 %kde4_runtime_requires Requires: kdebase4-runtime >= %_kde_platform_version kdebase4-runtime < 4.2.60 %kde4_pimlibs_requires Requires: kdepimlibs4 >= %_kde_pimlibs_version kdepimlibs4 < 4.2.60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ipsec-tools for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package ipsec-tools for openSUSE:Factory checked in at Wed May 6 18:41:13 CEST 2009. -------- --- ipsec-tools/ipsec-tools.changes 2008-09-23 15:09:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/ipsec-tools/ipsec-tools.changes 2009-05-06 16:45:34.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 6 15:54:01 CEST 2009 - jbohac(a)suse.cz + +- Upgrade to 0.7.2 +- fixed some rpmlint warnings/errors +- racoon.conf_macros.patch updates the .in file, not the result +- added /etc/pam.d/racoon +- added --with-libldap + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fix-ph1-leak.patch ipsec-tools-0.7.1.tar.bz2 New: ---- ipsec-tools-0.7.2.tar.bz2 racoon.pam ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipsec-tools.spec ++++++ --- /var/tmp/diff_new_pack.c25888/_old 2009-05-06 18:40:01.000000000 +0200 +++ /var/tmp/diff_new_pack.c25888/_new 2009-05-06 18:40:01.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ipsec-tools (Version 0.7.1) +# spec file for package ipsec-tools (Version 0.7.2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,9 +19,9 @@ Name: ipsec-tools -BuildRequires: bison flex kernel-source krb5-devel openssl-devel pam pam-devel readline-devel -Version: 0.7.1 -Release: 10 +BuildRequires: bison flex kernel-source krb5-devel openldap2-devel openssl-devel pam pam-devel readline-devel +Version: 0.7.2 +Release: 1 License: BSD 3-Clause Group: Productivity/Networking/Security Provides: racoon @@ -30,11 +30,11 @@ Summary: IPsec Utilities Source: http://prdownloads.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.b… Patch0: no_werror.patch -Patch1: fix-ph1-leak.patch Patch3: racoon.conf_macros.patch Source1: racoon.init Source2: sysconfig.racoon Source3: setkey.conf.sample +Source4: racoon.pam Url: http://ipsec-tools.sourceforge.net/ Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,7 +65,6 @@ %prep %setup %patch0 -p1 -%patch1 -p1 %patch3 -p1 %build @@ -78,12 +77,14 @@ --sharedstatedir=/var/run --localstatedir=/var/run \ --enable-dpd --enable-hybrid --enable-frag \ --enable-natt=yes --enable-gssapi=yes --enable-stats=yes \ - --enable-adminport --with-libpam --enable-security-context=no + --enable-adminport --with-libpam --enable-security-context=no \ + --with-libldap make + +%check make check %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/usr/include/racoon/admin.h \ $RPM_BUILD_ROOT/usr/include/racoon/evt.h \ @@ -107,14 +108,16 @@ ln -sf /etc/init.d/racoon $RPM_BUILD_ROOT/usr/sbin/rcracoon mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 $RPM_SOURCE_DIR/sysconfig.racoon $RPM_BUILD_ROOT/var/adm/fillup-templates/ -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/ -cp -rv src/racoon/samples $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/ -cp -v src/setkey/sample* $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/ +mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/examples/{setkey,racoon} +cp -rv src/racoon/samples $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/examples/racoon +cp -v src/setkey/sample* $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/examples/setkey mkdir -p $RPM_BUILD_ROOT/etc/racoon install -m 0600 src/racoon/samples/psk.txt $RPM_BUILD_ROOT/etc/racoon/ install -m 0644 src/racoon/samples/racoon.conf $RPM_BUILD_ROOT/etc/racoon/ cp -v $RPM_SOURCE_DIR/setkey.conf.sample $RPM_BUILD_ROOT/etc/racoon/setkey.conf touch $RPM_BUILD_ROOT/var/run/racoon/racoon.sock +mkdir -p $RPM_BUILD_ROOT/etc/pam.d +install -m 0644 %{S:4} $RPM_BUILD_ROOT/etc/pam.d/racoon %post %{fillup_and_insserv racoon} @@ -122,6 +125,9 @@ %postun %{insserv_cleanup} +%preun +%stop_on_removal racoon + %clean if test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/"; then rm -rf $RPM_BUILD_ROOT @@ -134,6 +140,7 @@ %config(noreplace) /etc/racoon/racoon.conf %config(noreplace) /etc/racoon/setkey.conf %config /etc/init.d/racoon +%config /etc/pam.d/racoon /usr/sbin/rcracoon %dir /usr/include/libipsec/ %doc /usr/share/doc/packages/%{name}/ @@ -150,6 +157,12 @@ %{_mandir}/man*/* %changelog +* Wed May 06 2009 jbohac(a)suse.cz +- Upgrade to 0.7.2 +- fixed some rpmlint warnings/errors +- racoon.conf_macros.patch updates the .in file, not the result +- added /etc/pam.d/racoon +- added --with-libldap * Tue Sep 23 2008 jbohac(a)suse.cz - fixed a memory leak in PH1 (bnc#416906, CVE-2008-3652) * Thu Aug 14 2008 jbohac(a)suse.cz @@ -174,7 +187,7 @@ - Fix a DoS in isakmp_info_recv (CVE-2007-1841, 260791) * Thu Mar 29 2007 aj(a)suse.de - Add flex and bison to BuildRequires. -* Fri May 05 2006 jbohac(a)suse.cz +* Thu May 04 2006 jbohac(a)suse.cz - fixed a segfault in GSSAPI initialization (#172196) - the /var/run/racoon directory was missing from the package which prevented racoon from starting (#170552) - fixed @@ -292,11 +305,11 @@ - update to 0.3rc1 * Tue Feb 03 2004 mludvig(a)suse.cz - Update to 0.2.4 -* Tue Jan 27 2004 ro(a)suse.de +* Mon Jan 26 2004 ro(a)suse.de - updated neededforbuild "kernel-source-26" -> "kernel-source" * Thu Jan 15 2004 mludvig(a)suse.cz - update to ipsec-tools-0.2.3 -* Sun Jan 11 2004 adrian(a)suse.de +* Sat Jan 10 2004 adrian(a)suse.de - remove obsolete %%run_ldconfig * Tue Dec 23 2003 mludvig(a)suse.cz - Recognize IPSEC_DIR_FWD when dumping SPD. ++++++ ipsec-tools-0.7.1.tar.bz2 -> ipsec-tools-0.7.2.tar.bz2 ++++++ ++++ 63036 lines of diff (skipped) ++++++ racoon.conf_macros.patch ++++++ --- /var/tmp/diff_new_pack.c25888/_old 2009-05-06 18:40:02.000000000 +0200 +++ /var/tmp/diff_new_pack.c25888/_new 2009-05-06 18:40:02.000000000 +0200 @@ -1,25 +1,22 @@ -The sample racoon.conf contains macros that should probably be expanded by -configure but they aren't. Patching configure to do it would be more hassle -than this patch for racoon.conf. - ---- ipsec-tools-0.6.5/src/racoon/samples/racoon.conf.in 2005-04-18 13:10:55.000000000 +0200 -+++ ipsec-tools-0.6.5.fix/src/racoon/samples/racoon.conf.in 2006-05-04 21:37:34.000000000 +0200 +diff -ruN ipsec-tools-0.7-orig/src/racoon/samples/racoon.conf.in ipsec-tools-0.7/src/racoon/samples/racoon.conf.in +--- ipsec-tools-0.7-orig/src/racoon/samples/racoon.conf.in 2006-09-09 16:22:36.000000000 +0000 ++++ ipsec-tools-0.7/src/racoon/samples/racoon.conf.in 2008-01-26 18:44:40.000000000 +0000 @@ -4,15 +4,15 @@ # "include" directive with relative file path. # you can overwrite "path" directive afterwards, however, doing so may add # more confusion. -path include "@sysconfdir_x@/racoon"; -+path include "/etc/racoon"; ++path include "@sysconfdir@"; #include "remote.conf"; # the file should contain key ID/key pairs, for pre-shared key authentication. -path pre_shared_key "@sysconfdir_x@/racoon/psk.txt"; -+path pre_shared_key "/etc/racoon/psk.txt"; ++path pre_shared_key "@sysconfdir@/psk.txt"; # racoon will look for certificate file in the directory, # if the certificate/certificate request payload is received. -path certificate "@sysconfdir_x@/cert"; -+path certificate "/etc/cert"; ++path certificate "@sysconfdir@/cert"; # "log" specifies logging level. It is followed by either "notify", "debug" # or "debug2". ++++++ racoon.pam ++++++ #%PAM-1.0 auth include common-auth auth required pam_nologin.so account include common-account password include common-password session include common-session ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gtk2-engine-murrine for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package gtk2-engine-murrine for openSUSE:Factory checked in at Wed May 6 18:39:43 CEST 2009. -------- --- GNOME/gtk2-engine-murrine/gtk2-engine-murrine.changes 2009-04-29 14:07:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtk2-engine-murrine/gtk2-engine-murrine.changes 2009-05-06 17:59:34.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 6 17:57:14 CEST 2009 - prusnak(a)suse.cz + +- themes split into separate package gtk2-theme-murrine + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- baselibs.conf Caramello_04.tar.bz2 freezy-themes_2.8.0.tar.bz2 Kiwi.tar.bz2 MurrinaAquaIsh.tar.bz2 MurrinaBlu-0.32.tar.bz2 MurrinaBlue.tar.bz2 MurrinaCandido.tar.bz2 MurrinaCandyDuo.tar.bz2 MurrinaChrome.tar.bz2 MurrinaCream.tar.bz2 MurrinaElement.tar.bz2 MurrinaEternal.tar.bz2 MurrinaFancyCandy.tar.bz2 MurrinaGilouche.tar.bz2 MurrinaGonxical.tar.bz2 MurrinaGperfection.tar.bz2 MurrinaGraphiteGentle.tar.bz2 Murrina-Inspirat.tar.bz2 MurrinaLily.tar.bz2 MurrinaLoveGray.tar.bz2 MurrinaOranche_02.tar.bz2 MurrinaOransun.tar.bz2 MurrinaTango.tar.bz2 MurrinaVerdeOlivo.tar.bz2 MurrinaX-2.tar.bz2 Murrine-Gray.tar.bz2 Murrine-Light.tar.bz2 MurrineRounded.tar.bz2 Murrine-Sky.tar.bz2 Neon.tar.bz2 shiki-colors-murrine-3.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2-engine-murrine.spec ++++++ --- /var/tmp/diff_new_pack.y21987/_old 2009-05-06 18:39:09.000000000 +0200 +++ /var/tmp/diff_new_pack.y21987/_new 2009-05-06 18:39:09.000000000 +0200 @@ -20,71 +20,27 @@ Name: gtk2-engine-murrine Version: 0.90.3 -Release: 1 -Url: http://www.cimitan.com/murrine/project/murrine +Release: 2 +Url: http://ftp.gnome.org/pub/GNOME/sources/murrine/ License: GPL v2 or later Group: System/GUI/XFCE -Summary: Murrine Gtk2 Cairo Engine +Summary: Murrine GTK Theme Engine Source: http://ftp.gnome.org/pub/GNOME/sources/murrine/0.90/murrine-%{version}.tar.… BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gtk2-devel >= 2.12 -BuildRequires: intltool pkg-config thunar-devel update-desktop-files +BuildRequires: gtk2-devel >= 2.12.0 +BuildRequires: intltool pkg-config Patch0: %{name}-%{version}-nonvoid.patch -Source10: Caramello_04.tar.bz2 -Source11: Kiwi.tar.bz2 -Source12: MurrinaAquaIsh.tar.bz2 -Source13: MurrinaBlu-0.32.tar.bz2 -Source14: MurrinaBlue.tar.bz2 -Source15: MurrinaCandido.tar.bz2 -Source16: MurrinaCandyDuo.tar.bz2 -Source17: MurrinaChrome.tar.bz2 -Source18: MurrinaCream.tar.bz2 -Source19: MurrinaElement.tar.bz2 -Source20: MurrinaEternal.tar.bz2 -Source21: MurrinaFancyCandy.tar.bz2 -Source22: MurrinaGilouche.tar.bz2 -Source23: MurrinaGonxical.tar.bz2 -Source24: MurrinaGperfection.tar.bz2 -Source25: MurrinaGraphiteGentle.tar.bz2 -Source26: Murrina-Inspirat.tar.bz2 -Source27: MurrinaLily.tar.bz2 -Source28: MurrinaLoveGray.tar.bz2 -Source29: MurrinaOranche_02.tar.bz2 -Source30: MurrinaOransun.tar.bz2 -Source31: MurrinaTango.tar.bz2 -Source32: MurrinaVerdeOlivo.tar.bz2 -Source33: Murrine-Gray.tar.bz2 -Source34: Murrine-Light.tar.bz2 -Source35: Murrine-Sky.tar.bz2 -Source36: MurrineRounded.tar.bz2 -Source37: MurrinaX-2.tar.bz2 -Source38: Neon.tar.bz2 -Source39: freezy-themes_2.8.0.tar.bz2 -Source40: shiki-colors-murrine-3.7.tar.bz2 %description -Murrine is a Gtk2 engine, written in C language, using cairo vectorial -drawing library to draw widgets. It features a modern glassy look, and -it is elegant and clean on the eyes. It is also extremely customizable. +Murrine is a GTK+ 2 theme engine, that uses the Cairo vector drawing +library to render widgets. It features a modern glassy look, is elegant +and clean on the eyes, and is extremely customizable. %prep %setup -q -n murrine-%{version} %patch0 -mkdir ../themes ; cd ../themes -tar xjf %{SOURCE10} ; tar xjf %{SOURCE11} ; tar xjf %{SOURCE12} ; tar xjf %{SOURCE13} ; tar xjf %{SOURCE14} -tar xjf %{SOURCE15} ; tar xjf %{SOURCE16} ; tar xjf %{SOURCE17} ; tar xjf %{SOURCE18} ; tar xjf %{SOURCE19} -tar xjf %{SOURCE20} ; tar xjf %{SOURCE21} ; tar xjf %{SOURCE22} ; tar xjf %{SOURCE23} ; tar xjf %{SOURCE24} -tar xjf %{SOURCE25} ; tar xjf %{SOURCE26} ; tar xjf %{SOURCE27} ; tar xjf %{SOURCE28} ; tar xjf %{SOURCE29} -tar xjf %{SOURCE30} ; tar xjf %{SOURCE31} ; tar xjf %{SOURCE32} ; tar xjf %{SOURCE33} ; tar xjf %{SOURCE34} -tar xjf %{SOURCE35} ; tar xjf %{SOURCE36} ; tar xjf %{SOURCE37} ; tar xjf %{SOURCE38} ; tar xjf %{SOURCE39} -tar xjf %{SOURCE40} -rm -f MurrinaCandyDuo/gtk-2.0/{,panel/}*~ "Shiki-Colors Striped Metacity"/metacity-1/*~ COPYING *svg README -mv freezy-themes*/{Blended,Carbon,Ciano,Unity-Wide,freezy} . -rm -rf freezy-themes* -find . -type d -exec chmod 755 {} \; -find . -type f -exec chmod 644 {} \; %build %configure --enable-animation @@ -93,9 +49,6 @@ %install make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/engines/*.la -# install themes -mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes -cp -a ../themes/* $RPM_BUILD_ROOT%{_datadir}/themes %clean rm -rf $RPM_BUILD_ROOT @@ -106,9 +59,10 @@ %{_libdir}/gtk-2.0/*/engines/* %dir %{_datadir}/gtk-engines %{_datadir}/gtk-engines/murrine.xml -%{_datadir}/themes/* %changelog +* Wed May 06 2009 prusnak(a)suse.cz +- themes split into separate package gtk2-theme-murrine * Wed Apr 29 2009 prusnak(a)suse.cz - updated to 0.90 series (0.90.3) * Too many changes to be listed, let's take a summary. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-panel for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package gnome-panel for openSUSE:Factory checked in at Wed May 6 18:39:03 CEST 2009. -------- --- GNOME/gnome-panel/gnome-panel.changes 2009-04-15 11:37:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-panel/gnome-panel.changes 2009-04-30 00:40:28.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 00:38:46 CEST 2009 - vuntz(a)novell.com + +- Move gconf entries file from /etc/gconf/macros to + /usr/share/gconf/macros. This is part of fate#305318. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-panel.spec ++++++ --- /var/tmp/diff_new_pack.l20612/_old 2009-05-06 18:38:51.000000000 +0200 +++ /var/tmp/diff_new_pack.l20612/_new 2009-05-06 18:38:51.000000000 +0200 @@ -42,9 +42,9 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files License: LGPL v2.1 or later -Group: System/GUI/GNOME +Group: Development/Libraries/GNOME Version: 2.26.1 -Release: 1 +Release: 2 Summary: The GNOME 2.x Desktop Panel Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.24/%{name}-%{version}.t… Url: http://www.gnome.org @@ -301,6 +301,8 @@ sed -i /GCONF_CONFIG_SOURCE/d %{name}.schemas_posttrans cat %{name}.schemas_list >%{name}.lst cat fish.lang %{name}-extras.schemas_list >%{name}-extras.lst +# Move .entries file to /usr/share/gconf/schemas, see fate#305318 +mv $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/gconf/schemas/panel-default-setup.entries for FILE in COPYING ; do MD5SUM=$(md5sum $FILE | sed 's/ .*//g') if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then @@ -319,7 +321,7 @@ /sbin/ldconfig %posttrans -f %{name}.schemas_posttrans export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` -usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load etc/gconf/schemas/panel-default-setup.entries >/dev/null +usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load usr/share/gconf/schemas/panel-default-setup.entries >/dev/null %preun -f %{name}.schemas_preun # Remove extra keys from panel-default-setup.entries. @@ -344,6 +346,7 @@ %dir %{_datadir}/gnome-panel/pixmaps %{_datadir}/applications/gnome-panel.desktop %{_datadir}/dbus-1/system-services/*.service +%{_datadir}/gconf/schemas/panel-default-setup.entries %{_datadir}/gnome-panel/pixmaps/[a-eg-z]*.png %{_datadir}/gnome-panel/pixmaps/fo*.png %{_datadir}/gnome-panel/pixmaps/clock-*.svg @@ -368,7 +371,6 @@ %{_libdir}/gnome-panel/lib[a-eg-z]*.so %{_prefix}/lib/gnome-panel/gnome-clock-applet-mechanism %doc %{_mandir}/man?/*.* -%config %{_sysconfdir}/gconf/schemas/panel-default-setup.entries %config %{_sysconfdir}/dbus-1/system.d/*.conf %files lang -f %{name}-2.0.lang @@ -402,6 +404,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Thu Apr 30 2009 vuntz(a)novell.com +- Move gconf entries file from /etc/gconf/macros to + /usr/share/gconf/macros. This is part of fate#305318. * Wed Apr 15 2009 vuntz(a)novell.com - Update to version 2.26.1: + Panel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gconf2 for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package gconf2 for openSUSE:Factory checked in at Wed May 6 18:38:58 CEST 2009. -------- --- GNOME/gconf2/gconf2.changes 2009-03-17 10:58:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/gconf2/gconf2.changes 2009-04-28 14:10:50.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Apr 28 11:52:06 CEST 2009 - vuntz(a)novell.com + +- Change the rpm gconf macros to move the .schemas files of + packages built with those macros from /etc/gconf/macros to + /usr/share/gconf/macros. + This implements fate#305318. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2.spec ++++++ --- /var/tmp/diff_new_pack.j20247/_old 2009-05-06 18:38:47.000000000 +0200 +++ /var/tmp/diff_new_pack.j20247/_new 2009-05-06 18:38:47.000000000 +0200 @@ -32,7 +32,7 @@ License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.26.0 -Release: 1 +Release: 2 Summary: The GNOME 2.x Desktop Configuration Database System Source: ftp://ftp.gnome.org/pub/gnome/sources/GConf/2.20/%{_name}-%{version}.tar.bz2 # Generic tool, not upstreamed: @@ -100,7 +100,7 @@ %install %makeinstall # Empty dir for schemas. -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas +mkdir -p $RPM_BUILD_ROOT%{_datadir}/gconf/schemas mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.mandatory mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.schemas mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.system @@ -120,6 +120,8 @@ rmdir --ignore-fail-on-non-empty etc/opt/gnome/gconf/schemas 2>/dev/null || : rmdir --ignore-fail-on-non-empty etc/opt/gnome/gconf 2>/dev/null || : rmdir --ignore-fail-on-non-empty etc/opt/gnome 2>/dev/null || : +# FIXME: remove this section for 12.2 (we deprecated /etc/gconf/schemas in favor if /usr/share/gconf/schemas during development of 11.2) +rmdir --ignore-fail-on-non-empty etc/gconf/schemas 2>/dev/null || : %post /sbin/ldconfig @@ -142,7 +144,8 @@ # customization). # WARNING: If this package will be renamed to gconf and upgraded from <=9.0, # the directory /etc/opt/gnome/gconf will be deleted by mistake. -if test $1 = 0 -a ! -d etc/gconf/schemas ; then +# FIXME: remove test for etc/gconf/schemas for 12.2 +if test $1 = 0 -a ! $ -d etc/gconf/schemas -o -d usr/share/gconf/schemas $ ; then rm -rf etc/gconf/gconf.xml.schemas fi @@ -169,8 +172,9 @@ %{_prefix}/lib/GConf/2/gconf-defaults-mechanism %doc %{_mandir}/man?/*.* %{_sysconfdir}/dbus-1/system.d/*.conf +%dir %{_datadir}/gconf +%dir %{_datadir}/gconf/schemas %dir %{_sysconfdir}/gconf -%dir %{_sysconfdir}/gconf/schemas %dir %{_sysconfdir}/gconf/gconf.xml.defaults %dir %{_sysconfdir}/gconf/gconf.xml.mandatory %dir %{_sysconfdir}/gconf/gconf.xml.vendor @@ -191,6 +195,11 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Apr 28 2009 vuntz(a)novell.com +- Change the rpm gconf macros to move the .schemas files of + packages built with those macros from /etc/gconf/macros to + /usr/share/gconf/macros. + This implements fate#305318. * Tue Mar 17 2009 mboman(a)suse.de - Update to version 2.26.0: + Correct url to gconf website @@ -258,7 +267,7 @@ * Fri Jan 23 2009 vuntz(a)novell.com - Drop gconf2-predictable-filenames.patch: this was fixed another way upstream. -* Sun Jan 11 2009 mboman(a)suse.de +* Mon Jan 12 2009 mboman(a)suse.de - Update to version 2.25.0: + Fix various format string warnings + Sync saved state to disk before closing @@ -282,7 +291,7 @@ * Tue Jun 24 2008 mauro(a)suse.de - Updated requirements for the -devel package in the spec (a package in the requirements changed it name to dbus-1-glib-devel). -* Fri Jun 06 2008 maw(a)suse.de +* Sat Jun 07 2008 maw(a)suse.de - Update to version 2.23.1: + Stop spamming syslog + Signal handling fixes @@ -430,7 +439,7 @@ - Remove upstreamed sentinel patch * Mon Jul 11 2005 sbrabec(a)suse.cz - Removed unneeded static modules and .la files for modules. -* Thu Jun 16 2005 gekker(a)suse.de +* Fri Jun 17 2005 gekker(a)suse.de - Fix sentinel patch to work with new glib2. * Tue Jun 07 2005 gekker(a)suse.de - Update to version 2.11.1. @@ -449,7 +458,7 @@ (non numeric if arguments need quoting) * Fri Nov 19 2004 gekker(a)suse.de - Update to version 2.8.1 -* Fri Oct 29 2004 ro(a)suse.de +* Sat Oct 30 2004 ro(a)suse.de - locale rename: no -> nb * Tue Oct 12 2004 sbrabec(a)suse.cz - Fixed libexecdir for bi-arch (#47050). ++++++ gconftool-rebuild ++++++ --- /var/tmp/diff_new_pack.j20247/_old 2009-05-06 18:38:47.000000000 +0200 +++ /var/tmp/diff_new_pack.j20247/_new 2009-05-06 18:38:47.000000000 +0200 @@ -54,19 +54,34 @@ umask 0022 mkdir$VERBOSE $GCONF_SCHEMAS_DIR shopt -s nullglob -cd /etc/gconf/schemas +cd /usr/share/gconf/schemas vecho "" vecho "Installing database entries from schemas..." -eval "(/bin/ls /etc/gconf/schemas/*.schemas | xargs /usr/bin/gconftool-2 --makefile-install-rule) $UNVERBOSE" +eval "(/bin/ls /usr/share/gconf/schemas/*.schemas | xargs /usr/bin/gconftool-2 --makefile-install-rule) $UNVERBOSE" vecho "" vecho "Installing database entries from entries..." -for SCHEMAS in /etc/gconf/schemas/*.entries ; do +for SCHEMAS in /usr/share/gconf/schemas/*.entries ; do eval /usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load $SCHEMAS$UNVERBOSE done -# /opt/gnome for compatibility with old packages (<=OpenSUSE 10.2 and SLED10) +# /etc/gconf/schemas for compatibility with old packages (<=openSUSE 11.1 and SLED11), can be removed for 12.2 +if test -d /etc/gconf/schemas ; then + cd /etc/gconf/schemas + + vecho "" + vecho "Installing database entries from schemas..." + eval "(/bin/ls /etc/gconf/schemas/*.schemas | xargs /usr/bin/gconftool-2 --makefile-install-rule) $UNVERBOSE" + + vecho "" + vecho "Installing database entries from entries..." + for SCHEMAS in /etc/gconf/schemas/*.entries ; do + eval /usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load $SCHEMAS$UNVERBOSE + done +fi + +# /opt/gnome for compatibility with old packages (<=OpenSUSE 10.2 and SLED10), can be removed for 11.3 if test -d /etc/opt/gnome/gconf/schemas ; then cd /etc/opt/gnome/gconf/schemas ++++++ macros.gconf2 ++++++ --- /var/tmp/diff_new_pack.j20247/_old 2009-05-06 18:38:47.000000000 +0200 +++ /var/tmp/diff_new_pack.j20247/_new 2009-05-06 18:38:47.000000000 +0200 @@ -54,8 +54,8 @@ if test "x$INSTALL_SCHEMA_FILES" != "x"; then\ usr/bin/gconftool-2 --makefile-install-rule $INSTALL_SCHEMA_FILES >/dev/null\ fi\ -rmdir etc/gconf/schemas/outdated 2>/dev/null || true' >>$GCONF_SCHEMAS_NAME.schemas_posttrans\ -echo ' rmdir etc/gconf/schemas/outdated 2>/dev/null || true\ +rmdir usr/share/gconf/schemas/outdated 2>/dev/null || true' >>$GCONF_SCHEMAS_NAME.schemas_posttrans\ +echo ' rmdir usr/share/gconf/schemas/outdated 2>/dev/null || true\ fi' >>$GCONF_SCHEMAS_NAME.schemas_preun\ %{nil} @@ -65,7 +65,7 @@ fi\ GCONF_SCHEMAS_NAME=%1\ echo '%defattr (644, root, root, 755)' >%1.schemas_list\ -echo 'mkdir -p etc/gconf/schemas/outdated' >%1.schemas_pre\ +echo 'mkdir -p usr/share/gconf/schemas/outdated' >%1.schemas_pre\ echo 'export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`\ INSTALL_SCHEMA_FILES=\ UNINSTALL_SCHEMA_FILES=' >%1.schemas_posttrans\ @@ -78,40 +78,52 @@ %_add_gconf_schemas() \ echo $SCHEMAS >>$GCONF_SCHEMAS_NAME.schemas_list\ echo "if test -f ${SCHEMAS#/} ; then\ - ln -f ${SCHEMAS#/} etc/gconf/schemas/outdated/\ + ln -f ${SCHEMAS#/} usr/share/gconf/schemas/outdated/\ +else\ + # Migration from /etc/gconf/schemas to /usr/share/gconf/schemas. Can be removed for openSUSE 12.2\ + if test -f etc/gconf/schemas/${SCHEMAS#/usr/share/gconf/schemas/} ; then\ + # We do cp instead of ln since /usr and /etc might be on different partitions\ + cp etc/gconf/schemas/${SCHEMAS#/usr/share/gconf/schemas/} usr/share/gconf/schemas/outdated/\ + fi\ fi" >>$GCONF_SCHEMAS_NAME.schemas_pre\ -echo "if test -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}; then\ - cmp --quiet etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/} ${SCHEMAS#/}\ +echo "if test -f usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/}; then\ + cmp --quiet usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/} ${SCHEMAS#/}\ if test \\\$? != 0; then\ - UNINSTALL_SCHEMA_FILES=\\\"\\\$UNINSTALL_SCHEMA_FILES etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}\\\"\ + UNINSTALL_SCHEMA_FILES=\\\"\\\$UNINSTALL_SCHEMA_FILES usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/}\\\"\ INSTALL_SCHEMA_FILES=\\\"\\\$INSTALL_SCHEMA_FILES ${SCHEMAS#/}\\\"\ else\ - rm -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}\ + rm -f usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/}\ fi\ else\ INSTALL_SCHEMA_FILES=\\\"\\\$INSTALL_SCHEMA_FILES ${SCHEMAS#/}\\\"\ fi" >>$GCONF_SCHEMAS_NAME.schemas_posttrans\ echo " if test -x usr/bin/gconftool-2 ; then\ - if test -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/} ; then\ - usr/bin/gconftool-2 --makefile-uninstall-rule etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/} >/dev/null\ + if test -f usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/} ; then\ + usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/} >/dev/null\ elif test -f ${SCHEMAS#/} ; then\ usr/bin/gconftool-2 --makefile-uninstall-rule ${SCHEMAS#/} >/dev/null\ fi\ fi\ - rm -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}" >>$GCONF_SCHEMAS_NAME.schemas_preun\ + rm -f usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/}" >>$GCONF_SCHEMAS_NAME.schemas_preun\ %{nil} %add_gconf_schemas() \ -SCHEMAS=/etc/gconf/schemas/%1.schemas\ +mkdir -p $RPM_BUILD_ROOT/usr/share/gconf/schemas\ +SCHEMAS=/usr/share/gconf/schemas/%1.schemas\ +mv $RPM_BUILD_ROOT/etc/gconf/schemas/%1.schemas ${RPM_BUILD_ROOT}${SCHEMAS}\ %_add_gconf_schemas\ %{nil} %find_gconf_schemas() \ test -d $RPM_BUILD_ROOT/etc/gconf/schemas\ +mkdir -p $RPM_BUILD_ROOT/usr/share/gconf/schemas\ %def_gconf_schemas %{name}\ for SCHEMAS in $RPM_BUILD_ROOT/etc/gconf/schemas/*.schemas ; do\ test -f $SCHEMAS\ - SCHEMAS=${SCHEMAS#$RPM_BUILD_ROOT}\ + SCHEMASFILENAME=${SCHEMAS#$RPM_BUILD_ROOT/etc/gconf/schemas/}\ + NEWSCHEMAS=/usr/share/gconf/schemas/$SCHEMASFILENAME\ + mv $SCHEMAS ${RPM_BUILD_ROOT}${NEWSCHEMAS}\ + SCHEMAS=$NEWSCHEMAS\ %_add_gconf_schemas\ done\ %end_gconf_schemas\ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 freetype2 for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package freetype2 for openSUSE:Factory checked in at Wed May 6 18:38:40 CEST 2009. -------- --- freetype2/freetype2.changes 2008-12-10 13:59:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/freetype2/freetype2.changes 2009-04-16 18:08:40.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 16 18:08:31 CEST 2009 - nadvornik(a)suse.cz + +- fixed integer overflows [bnc#485889] CVE-2009-0946 + +------------------------------------------------------------------- +Mon Mar 9 16:48:46 CET 2009 - crrodriguez(a)suse.de + +- freetype2 has subpixel rendering enabled [bnc#478407] + +------------------------------------------------------------------- --- freetype2/ft2demos.changes 2008-11-05 17:01:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/freetype2/ft2demos.changes 2009-04-16 17:56:00.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 16 17:55:50 CEST 2009 - nadvornik(a)suse.cz + +- fixed integer overflows [bnc#485889] CVE-2009-0946 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bnc485889-overflow1.patch bnc485889-overflow2.patch bnc485889-overflow3.patch bnc485889-overflow4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetype2.spec ++++++ --- /var/tmp/diff_new_pack.y17982/_old 2009-05-06 18:38:10.000000000 +0200 +++ /var/tmp/diff_new_pack.y17982/_new 2009-05-06 18:38:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package freetype2 (Version 2.3.7) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: freetype2 BuildRequires: zlib-devel -License: Other uncritical OpenSource License +License: Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT Group: System/Libraries AutoReqProv: on # bug437293 @@ -29,7 +29,7 @@ %endif # Version: 2.3.7 -Release: 24 +Release: 26 Url: http://www.freetype.org Summary: A TrueType Font Library # CVS repository: @@ -48,6 +48,10 @@ Patch10: uninitialized-variable.patch Patch308961: bugzilla-308961-cmex-workaround.patch Patch441638: bnc441638-bc-enabling-fix-from-cvs.patch +Patch11: bnc485889-overflow1.patch +Patch12: bnc485889-overflow2.patch +Patch13: bnc485889-overflow3.patch +Patch14: bnc485889-overflow4.patch Patch100: freetype2-bc.patch Patch200: freetype2-subpixel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,7 +69,7 @@ Werner Lemberg <werner.lemberg(a)freetype.org> %package devel -License: GPL v2 or later +License: GPL v2 or later; Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT Summary: Development environment for the freetype2 TrueType font library Group: Development/Libraries/C and C++ Requires: %{name} = %{version}, zlib-devel @@ -100,7 +104,7 @@ # in /etc/sysconfig/fonts-config. # %define enable_bytecode_interpreter 1 -%define enable_subpixel_rendering 0%{?opensuse_bs} +%define enable_subpixel_rendering 0 %setup -q -n freetype-%{version} -a 1 %patch3 -p 1 -b .bitmap-foundry %patch4 -p 1 -b .ft2-stream-compat @@ -110,6 +114,10 @@ %patch10 -p 1 %patch308961 -p 1 %patch441638 -p 1 +%patch11 -p 1 +%patch12 -p 1 +%patch13 -p 1 +%patch14 -p 1 %if %{enable_bytecode_interpreter} %patch100 -p 1 -b .bytecode %endif @@ -163,6 +171,10 @@ /usr/share/aclocal/* %changelog +* Thu Apr 16 2009 nadvornik(a)suse.cz +- fixed integer overflows [bnc#485889] CVE-2009-0946 +* Mon Mar 09 2009 crrodriguez(a)suse.de +- freetype2 has subpixel rendering enabled [bnc#478407] * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) @@ -497,7 +509,7 @@ - update to 2.1.7. - remove freetype2-type1.patch (included upstream) - add documentation. -* Wed Oct 08 2003 schwab(a)suse.de +* Thu Oct 09 2003 schwab(a)suse.de - Fix invalid free. * Fri Sep 26 2003 mfabian(a)suse.de - update to 2.1.5. @@ -613,7 +625,7 @@ - fix build-rooting * Thu Dec 14 2000 kukuk(a)suse.de - split devel package -* Mon Dec 11 2000 egger(a)suse.de +* Tue Dec 12 2000 egger(a)suse.de - Updated to version 2.0.1. * Fri Nov 10 2000 egger(a)suse.de - Initial SuSE package. ++++++ ft2demos.spec ++++++ --- /var/tmp/diff_new_pack.y17982/_old 2009-05-06 18:38:11.000000000 +0200 +++ /var/tmp/diff_new_pack.y17982/_new 2009-05-06 18:38:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ft2demos (Version 2.3.7) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Supplements: fonts-config %endif Version: 2.3.7 -Release: 31 +Release: 33 %define freetype_version %{version} Url: http://www.freetype.org Summary: Freetype2 Utilities and Demo Programs @@ -48,6 +48,10 @@ Patch9: fix-build.patch Patch308961: bugzilla-308961-cmex-workaround.patch Patch441638: bnc441638-bc-enabling-fix-from-cvs.patch +Patch11: bnc485889-overflow1.patch +Patch12: bnc485889-overflow2.patch +Patch13: bnc485889-overflow3.patch +Patch14: bnc485889-overflow4.patch Patch50: ft2demos-build-testname.patch Patch100: freetype2-bc.patch Patch101: ft2demos-bc.patch @@ -84,6 +88,10 @@ %patch9 -p 1 %patch308961 -p 1 %patch441638 -p 1 +%patch11 -p 1 +%patch12 -p 1 +%patch13 -p 1 +%patch14 -p 1 pushd ../ft2demos-%{version} %patch50 -p 1 popd @@ -137,6 +145,8 @@ %{_bindir}/testname %changelog +* Thu Apr 16 2009 nadvornik(a)suse.cz +- fixed integer overflows [bnc#485889] CVE-2009-0946 * Wed Nov 05 2008 mfabian(a)suse.de - bnc#441638: use fix from upstream CVS to fix the return value of FT_Get_TrueType_Engine_Type (and make it work as documented). @@ -456,7 +466,7 @@ * Wed Dec 17 2003 mfabian(a)suse.de - update to 2.1.7. - remove freetype2-type1.patch (included upstream) -* Wed Oct 08 2003 schwab(a)suse.de +* Thu Oct 09 2003 schwab(a)suse.de - Fix invalid free. * Fri Sep 26 2003 mfabian(a)suse.de - update to 2.1.5. ++++++ bnc485889-overflow1.patch ++++++ >From 0545ec1ca36b27cb928128870a83e5f668980bc5 Mon Sep 17 00:00:00 2001 From: Werner Lemberg <wl(a)gnu.org> Date: Fri, 20 Mar 2009 05:49:10 +0000 Subject: Protect against invalid SID values in CFFs. Problem reported by Tavis Ormandy <taviso(a)google.com>. * src/cff/cffload.c (cff_charset_load): Reject SID values larger than 64999. --- diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 22163fb..24b899d 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -842,7 +842,20 @@ goto Exit; for ( j = 1; j < num_glyphs; j++ ) - charset->sids[j] = FT_GET_USHORT(); + { + FT_UShort sid = FT_GET_USHORT(); + + + /* this constant is given in the CFF specification */ + if ( sid < 65000 ) + charset->sids[j] = sid; + else + { + FT_ERROR(( "cff_charset_load:" + " invalid SID value %d set to zero\n", sid )); + charset->sids[j] = 0; + } + } FT_FRAME_EXIT(); } @@ -875,6 +888,20 @@ goto Exit; } + /* check whether the range contains at least one valid glyph; */ + /* the constant is given in the CFF specification */ + if ( glyph_sid >= 65000 ) { + FT_ERROR(( "cff_charset_load: invalid SID range\n" )); + error = CFF_Err_Invalid_File_Format; + goto Exit; + } + + /* try to rescue some of the SIDs if `nleft' is too large */ + if ( nleft > 65000 - 1 || glyph_sid >= 65000 - nleft ) { + FT_ERROR(( "cff_charset_load: invalid SID range trimmed\n" )); + nleft = 65000 - 1 - glyph_sid; + } + /* Fill in the range of sids -- `nleft + 1' glyphs. */ for ( i = 0; j < num_glyphs && i <= nleft; i++, j++, glyph_sid++ ) charset->sids[j] = glyph_sid; -- cgit v0.8.2 ++++++ bnc485889-overflow2.patch ++++++ >From 0a05ba257b6ddd87dacf8d54b626e4b360e0a596 Mon Sep 17 00:00:00 2001 From: Werner Lemberg <wl(a)gnu.org> Date: Fri, 20 Mar 2009 06:19:45 +0000 Subject: Protect against malformed compressed data. Problem reported by Tavis Ormandy <taviso(a)google.com>. * src/lsw/ftzopen.c (ft_lzwstate_io): Test whether `state->prefix' is zero. --- diff --git a/src/lzw/ftzopen.c b/src/lzw/ftzopen.c index fc78315..c0483de 100644 --- a/src/lzw/ftzopen.c +++ b/src/lzw/ftzopen.c @@ -332,6 +332,9 @@ while ( code >= 256U ) { + if ( !state->prefix ) + goto Eof; + FTLZW_STACK_PUSH( state->suffix[code - 256] ); code = state->prefix[code - 256]; } -- cgit v0.8.2 ++++++ bnc485889-overflow3.patch ++++++ >From 79972af4f0485a11dcb19551356c45245749fc5b Mon Sep 17 00:00:00 2001 From: Werner Lemberg <wl(a)gnu.org> Date: Fri, 20 Mar 2009 07:21:37 +0000 Subject: Protect against too large glyphs. Problem reported by Tavis Ormandy <taviso(a)google.com>. * src/smooth/ftsmooth.c (ft_smooth_render_generic): Don't allow `width' or `pitch' to be larger than 0xFFFF. --- diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c index a6db504..cacc490 100644 --- a/src/smooth/ftsmooth.c +++ b/src/smooth/ftsmooth.c @@ -153,7 +153,7 @@ slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP; } - /* allocate new one, depends on pixel format */ + /* allocate new one */ pitch = width; if ( hmul ) { @@ -194,6 +194,13 @@ #endif + if ( pitch > 0xFFFF || height > 0xFFFF ) + { + FT_ERROR(( "ft_smooth_render_generic: glyph too large: %d x %d\n", + width, height )); + return Smooth_Err_Raster_Overflow; + } + bitmap->pixel_mode = FT_PIXEL_MODE_GRAY; bitmap->num_grays = 256; bitmap->width = width; -- cgit v0.8.2 ++++++ bnc485889-overflow4.patch ++++++ >From a18788b14db60ae3673f932249cd02d33a227c4e Mon Sep 17 00:00:00 2001 From: Werner Lemberg <wl(a)gnu.org> Date: Fri, 20 Mar 2009 07:03:58 +0000 Subject: Fix validation for various cmap table formats. * src/sfnt/ttcmap.c (tt_cmap8_validate, tt_cmap10_validate, tt_cmap12_validate): Check `length' correctly. (tt_cmap_14_validate): Check `length' and `numMappings' correctly. --- diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index 6830391..1bd2ce7 100644 --- a/src/sfnt/ttcmap.c +++ b/src/sfnt/ttcmap.c @@ -1635,7 +1635,7 @@ FT_INVALID_TOO_SHORT; length = TT_NEXT_ULONG( p ); - if ( table + length > valid->limit || length < 8208 ) + if ( length > (FT_UInt32)( valid->limit - table ) || length < 8192 + 16 ) FT_INVALID_TOO_SHORT; is32 = table + 12; @@ -1863,7 +1863,8 @@ p = table + 16; count = TT_NEXT_ULONG( p ); - if ( table + length > valid->limit || length < 20 + count * 2 ) + if ( length > (FT_ULong)( valid->limit - table ) || + length < 20 + count * 2 ) FT_INVALID_TOO_SHORT; /* check glyph indices */ @@ -2048,7 +2049,8 @@ p = table + 12; num_groups = TT_NEXT_ULONG( p ); - if ( table + length > valid->limit || length < 16 + 12 * num_groups ) + if ( length > (FT_ULong)( valid->limit - table ) || + length < 16 + 12 * num_groups ) FT_INVALID_TOO_SHORT; /* check groups, they must be in increasing order */ @@ -2429,7 +2431,8 @@ FT_ULong num_selectors = TT_NEXT_ULONG( p ); - if ( table + length > valid->limit || length < 10 + 11 * num_selectors ) + if ( length > (FT_ULong)( valid->limit - table ) || + length < 10 + 11 * num_selectors ) FT_INVALID_TOO_SHORT; /* check selectors, they must be in increasing order */ @@ -2491,7 +2494,7 @@ FT_ULong i, lastUni = 0; - if ( ndp + numMappings * 4 > valid->limit ) + if ( numMappings * 4 > (FT_ULong)( valid->limit - ndp ) ) FT_INVALID_TOO_SHORT; for ( i = 0; i < numMappings; ++i ) -- cgit v0.8.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 file for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at Wed May 6 18:38:36 CEST 2009. -------- --- file/file.changes 2009-01-26 21:17:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file.changes 2009-05-06 14:46:22.000000000 +0200 @@ -1,0 +2,19 @@ +Wed May 6 14:37:51 CEST 2009 - werner(a)suse.de + +- Update to filx version 5.02 + * Read ~/.magic in addition to the default magic file not instead + of, as documented in the man page. + * filesystem and msdos patches (Joerg Jenderek) + * Added CDF parsing + * Add text/x-lua MIME type for Lua scripts. + * >= <= is not supported, so fix the magic and warn about it. + reported by: Thien-Thi Nguyen <ttn(a)gnuvola.org> + * use memchr instead of strchr because the string + might not be NUL terminated (Scott MacVicar) + * Fix --mime, --mime-type and --mime-encoding under new scheme. + * add loop limits to avoid DoS attacks by constructing + looping sector references. + * Allow escaping of relation characters, so that we can say \^[A-Z] + and the ^ is not eaten as a relation char. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- file-4.21-option.dif file-4.24.dif file-4.24-exec.dif file-4.24-extfs-mp3.dif file-4.24-javacheck.dif file-4.24-misc.dif file-4.24.tar.bz2 New: ---- file-5.02.dif file-5.02-exec.dif file-5.02-javacheck.dif file-5.02-misc.dif file-5.02-option.dif file-5.02.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.L16969/_old 2009-05-06 18:38:04.000000000 +0200 +++ /var/tmp/diff_new_pack.L16969/_new 2009-05-06 18:38:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package file (Version 4.24) +# spec file for package file (Version 5.02) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,13 +30,13 @@ %endif # # Set Version also in python-magic.spec -Version: 4.24 -Release: 44 +Version: 5.02 +Release: 1 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif -Patch1: file-4.24-misc.dif -Patch3: file-4.24-exec.dif +Patch1: file-5.02-misc.dif +Patch3: file-5.02-exec.dif Patch4: file-4.24-autoconf.dif Patch5: file-4.03-tex.dif Patch7: file-4.20-ssd.dif @@ -44,7 +44,7 @@ Patch9: file-4.24-elf.dif Patch10: file-4.18-printf.dif Patch11: file-4.24-reg_dos.dif -Patch12: file-4.21-option.dif +Patch12: file-5.02-option.dif Patch13: file-4.21-scribus.dif Patch14: file-4.24-awk.dif Patch15: file-4.21-xcursor.dif @@ -52,9 +52,8 @@ Patch20: file-4.24-mips.dif Patch21: file-4.16-python.dif Patch22: file-4.24-cromfs.dif -Patch23: file-4.24-extfs-mp3.dif Patch24: file-4.24-warn.dif -Patch25: file-4.24-javacheck.dif +Patch25: file-5.02-javacheck.dif Patch26: file-4.24-solv.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -115,7 +114,6 @@ %patch21 -p0 -b .python %endif %patch22 -p0 -b .cromfs -%patch23 -p0 -b .extfs-mp3 %patch24 -p0 -b .warn %patch25 -p0 -b .javacheck %patch26 -p0 -b .solv @@ -175,6 +173,22 @@ %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog +* Wed May 06 2009 werner(a)suse.de +- Update to filx version 5.02 + * Read ~/.magic in addition to the default magic file not instead + of, as documented in the man page. + * filesystem and msdos patches (Joerg Jenderek) + * Added CDF parsing + * Add text/x-lua MIME type for Lua scripts. + * >= <= is not supported, so fix the magic and warn about it. + reported by: Thien-Thi Nguyen <ttn(a)gnuvola.org> + * use memchr instead of strchr because the string + might not be NUL terminated (Scott MacVicar) + * Fix --mime, --mime-type and --mime-encoding under new scheme. + * add loop limits to avoid DoS attacks by constructing + looping sector references. + * Allow escaping of relation characters, so that we can say \^[A-Z] + and the ^ is not eaten as a relation char. * Mon Jan 26 2009 crrodriguez(a)suse.de - remove "la" files and static libraries * Wed Dec 10 2008 olh(a)suse.de @@ -261,7 +275,7 @@ - Add zlib-devel BuildRequires * Wed Mar 21 2007 werner(a)suse.de - Update to file 4.20 due security reason CVE-2007-1536 (#256290) -* Tue Mar 06 2007 rguenther(a)suse.de +* Wed Mar 07 2007 rguenther(a)suse.de - Fix order of changelog entries * Thu Nov 23 2006 werner(a)suse.de - Initialize variable in elf patch @@ -419,7 +433,7 @@ - ran old prepare_spec on spec file to switch to new prepare_spec. * Tue Aug 24 1999 uli(a)suse.de - added -fsigned-char to CFLAGS (PPC) -* Wed Nov 04 1998 ro(a)suse.de +* Thu Nov 05 1998 ro(a)suse.de - disabled dcore (won't build with glibc-2.0) * Thu Oct 01 1998 ro(a)suse.de - update to 3.26 ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.L16969/_old 2009-05-06 18:38:04.000000000 +0200 +++ /var/tmp/diff_new_pack.L16969/_new 2009-05-06 18:38:04.000000000 +0200 @@ -23,11 +23,11 @@ BuildRequires: findutils zlib-devel BuildRequires: python-devel Url: http://www.darwinsys.com/file/ -License: Other uncritical OpenSource License +License: BSD 3 Clause, BSD 4 Clause Group: Development/Languages/Python AutoReqProv: on Version: 4.24 -Release: 52 +Release: 53 Summary: Python module to use libmagic %py_requires Source99: file.spec ++++++ file-4.21-option.dif -> file-5.02.dif ++++++ --- file/file-4.21-option.dif 2008-07-23 18:34:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.02.dif 2009-05-05 14:43:40.000000000 +0200 @@ -1,37 +1,469 @@ ---- src/file.c -+++ src/file.c 2007-06-06 16:33:10.402651296 +0200 -@@ -240,6 +240,8 @@ main(int argc, char *argv[]) - flags |= MAGIC_DEBUG|MAGIC_CHECK; - break; - case 'e': -+ if (!optarg) -+ usage(); - for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++) - if (strcmp(nv[i].name, optarg) == 0) - break; -@@ -251,13 +253,15 @@ main(int argc, char *argv[]) - break; - - case 'f': -- if(action) -+ if(action || !optarg) - usage(); - load(magicfile, flags); - unwrap(optarg); - ++didsomefiles; - break; - case 'F': -+ if (!optarg) -+ usage(); - separator = optarg; - break; - case 'i': -@@ -267,6 +271,8 @@ main(int argc, char *argv[]) - flags |= MAGIC_CONTINUE; - break; - case 'm': -+ if (!optarg) -+ usage(); - magicfile = optarg; - break; - case 'n': +--- magic/Header ++++ magic/Header 2006-03-27 13:29:19.000000000 +0200 +@@ -1,5 +1,7 @@ + # Magic + # Magic data for file(1) command. +-# Machine-generated from src/cmd/file/magdir/*; edit there only! +-# Format is described in magic(files), where: +-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID. ++# Format is described in magic(5). ++# ++# Note: If you have edited this file you may run `file -C' ++# to make a pre-compiled magic.mgc for faster execution ++# +--- magic/Makefile.am ++++ magic/Makefile.am 2009-05-05 14:17:32.181901712 +0200 +@@ -4,7 +4,7 @@ + MAGIC_FRAGMENT_BASE = Magdir + MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE) + +-pkgdata_DATA = magic.mgc ++pkgdata_DATA = magic.mgc magic + + EXTRA_DIST = Header Localstuff \ + $(MAGIC_FRAGMENT_DIR)/acorn \ +@@ -17,7 +17,6 @@ $(MAGIC_FRAGMENT_DIR)/amanda \ + $(MAGIC_FRAGMENT_DIR)/amigaos \ + $(MAGIC_FRAGMENT_DIR)/animation \ + $(MAGIC_FRAGMENT_DIR)/apl \ +-$(MAGIC_FRAGMENT_DIR)/apple \ + $(MAGIC_FRAGMENT_DIR)/applix \ + $(MAGIC_FRAGMENT_DIR)/archive \ + $(MAGIC_FRAGMENT_DIR)/asterix \ +@@ -64,7 +63,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/erlang \ + $(MAGIC_FRAGMENT_DIR)/esri \ + $(MAGIC_FRAGMENT_DIR)/fcs \ +-$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/flash \ + $(MAGIC_FRAGMENT_DIR)/fonts \ + $(MAGIC_FRAGMENT_DIR)/fortran \ +@@ -95,19 +93,19 @@ $(MAGIC_FRAGMENT_DIR)/island \ + $(MAGIC_FRAGMENT_DIR)/ispell \ + $(MAGIC_FRAGMENT_DIR)/java \ + $(MAGIC_FRAGMENT_DIR)/jpeg \ ++$(MAGIC_FRAGMENT_DIR)/linux \ ++$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/karma \ + $(MAGIC_FRAGMENT_DIR)/kde \ + $(MAGIC_FRAGMENT_DIR)/kml \ + $(MAGIC_FRAGMENT_DIR)/lecter \ + $(MAGIC_FRAGMENT_DIR)/lex \ + $(MAGIC_FRAGMENT_DIR)/lif \ +-$(MAGIC_FRAGMENT_DIR)/linux \ + $(MAGIC_FRAGMENT_DIR)/lisp \ + $(MAGIC_FRAGMENT_DIR)/llvm \ + $(MAGIC_FRAGMENT_DIR)/lua \ + $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/mach \ +-$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/magic \ + $(MAGIC_FRAGMENT_DIR)/mail.news \ + $(MAGIC_FRAGMENT_DIR)/maple \ +@@ -123,10 +121,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ + $(MAGIC_FRAGMENT_DIR)/mkid \ + $(MAGIC_FRAGMENT_DIR)/mlssa \ + $(MAGIC_FRAGMENT_DIR)/mmdf \ +-$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/motorola \ + $(MAGIC_FRAGMENT_DIR)/mozilla \ + $(MAGIC_FRAGMENT_DIR)/msdos \ ++$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/msvc \ + $(MAGIC_FRAGMENT_DIR)/mup \ + $(MAGIC_FRAGMENT_DIR)/natinst \ +@@ -163,6 +161,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ + $(MAGIC_FRAGMENT_DIR)/python \ + $(MAGIC_FRAGMENT_DIR)/revision \ + $(MAGIC_FRAGMENT_DIR)/riff \ ++$(MAGIC_FRAGMENT_DIR)/apple \ ++$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/rpm \ + $(MAGIC_FRAGMENT_DIR)/rtf \ + $(MAGIC_FRAGMENT_DIR)/ruby \ +@@ -220,8 +220,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \ + $(MAGIC_FRAGMENT_DIR)/zilog \ + $(MAGIC_FRAGMENT_DIR)/zyxel + ++RAW = magic + MAGIC = magic.mgc +-CLEANFILES = ${MAGIC} ++CLEANFILES = ${MAGIC} ${RAW} ++ ++${RAW}: Header Localstuff $(EXTRA_DIST) ++ cat /dev/null > $@ ++ for frag in $(EXTRA_DIST); do \ ++ if test -f $(srcdir)/$$frag; then \ ++ f=$(srcdir)/$$frag; \ ++ else \ ++ f=$$frag; \ ++ fi; \ ++ cat $$f; \ ++ done >> $@ + + # FIXME: Build file natively as well so that it can be used to compile + # the target's magic file +@@ -233,6 +245,5 @@ FILE_COMPILE = $(top_builddir)/src/file + FILE_COMPILE_DEP = $(FILE_COMPILE) + endif + +-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) +- $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR) +- @mv $(MAGIC_FRAGMENT_BASE).mgc $@ ++${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW) ++ $(FILE_COMPILE) -C -m $(RAW) +--- magic/Magdir/elf ++++ magic/Magdir/elf 2006-11-22 15:57:15.000000000 +0100 +@@ -101,7 +101,7 @@ + >>18 leshort 47 Renesas H8/300H, + >>18 leshort 48 Renesas H8S, + >>18 leshort 49 Renesas H8/500, +->>18 leshort 50 IA-64, ++>>18 leshort 50 IA-64 (Intel 64 bit architecture), + >>18 leshort 51 Stanford MIPS-X, + >>18 leshort 52 Motorola Coldfire, + >>18 leshort 53 Motorola M68HC12, +@@ -246,7 +246,7 @@ + >>18 beshort 47 Renesas H8/300H, + >>18 beshort 48 Renesas H8S, + >>18 beshort 49 Renesas H8/500, +->>18 beshort 50 IA-64, ++>>18 beshort 50 IA-64 (Intel 64 bit architecture), + >>18 beshort 51 Stanford MIPS-X, + >>18 beshort 52 Motorola Coldfire, + >>18 beshort 53 Motorola M68HC12, +--- magic/Magdir/linux ++++ magic/Magdir/linux 2009-05-05 14:25:20.898401425 +0200 +@@ -81,21 +81,43 @@ + # and Nicol�s Lichtmaier <nick(a)debian.org> + # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 + # Linux kernel boot images (i386 arch) (Wolfram Kleff) +-514 string HdrS Linux kernel +->510 leshort 0xAA55 x86 boot executable +->>518 leshort >0x1ff +->>>529 byte 0 zImage, +->>>529 byte 1 bzImage, +->>>(526.s+0x200) string >\0 version %s, +->>498 leshort 1 RO-rootFS, +->>498 leshort 0 RW-rootFS, +->>508 leshort >0 root_dev 0x%X, +->>502 leshort >0 swap_dev 0x%X, +->>504 leshort >0 RAMdisksize %u KB, +->>506 leshort 0xFFFF Normal VGA +->>506 leshort 0xFFFE Extended VGA +->>506 leshort 0xFFFD Prompt for Videomode +->>506 leshort >0 Video mode %d ++514 string HdrS Linux ++>510 leshort 0xAA55 \b/x86 Kernel ++>510 leshort <0xAA55 Kernel ++>510 leshort >0xAA55 Kernel ++>518 leshort 0x0105 \b, Setup Version 0x105, zImage ++>518 leshort >0x0105 \b, Setup Version %#hx ++>>529 byte 0 \b, zImage ++>>529 byte 1 \b, bzImage ++>>>(526.s+0x205) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x205) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x208) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %8.8s ++>>>(526.s+0x209) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %9.9s ++>>>(526.s+0x20a) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %10.10s ++>>>(526.s+0x20b) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %11.11s ++>>498 leshort 1 \b, RO-rootFS ++>>498 leshort 0 \b, RW-rootFS ++>>508 leshort >0 \b, root_dev 0x%X ++>>502 leshort >0 \b, swap_dev 0x%X ++>>504 leshort >0 \b, RAMdisksize %u KB ++>>506 leshort 0xFFFF \b, Normal VGA ++>>506 leshort 0xFFFE \b, Extended VGA ++>>506 leshort 0xFFFD \b, Prompt for Videomode ++>>506 leshort >0 \b, Video mode %d + # This also matches new kernels, which were caught above by "HdrS". + 0 belong 0xb8c0078e Linux kernel + >0x1e3 string Loading version 1.3.79 or older +--- magic/Magdir/modem ++++ magic/Magdir/modem 2006-03-27 13:29:19.000000000 +0200 +@@ -2,9 +2,9 @@ + # modem: file(1) magic for modem programs + # + # From: Florian La Roche <florian(a)knorke.saar.de> +-4 string Research, Digifax-G3-File +->29 byte 1 , fine resolution +->29 byte 0 , normal resolution ++1 string PC\ Research,\ Inc Digifax-G3-File ++>29 byte 1 \b, fine resolution ++>29 byte 0 \b, normal resolution + + 0 short 0x0100 raw G3 data, byte-padded + 0 short 0x1400 raw G3 data +--- magic/Magdir/msad ++++ magic/Magdir/msad 2006-03-27 13:29:19.000000000 +0200 +@@ -0,0 +1,5 @@ ++#------------------------------------------------------------------------------ ++# msad: file(1) magic for msad ++# Microsoft visual C ++# This must precede the heuristic for raw G3 data ++4 string Standard\ Jet\ DB Microsoft Access Database +--- magic/Magdir/msdos ++++ magic/Magdir/msdos 2009-05-05 14:29:29.646404153 +0200 +@@ -70,6 +70,7 @@ + >>&0 leshort 0x290 PA-RISC + >>&18 leshort&0x0100 >0 32-bit + >>&18 leshort&0x1000 >0 system file ++>>&228 lelong >0 \b, Mono/.Net assembly + >>&0xf4 search/0x140 \x0\x40\x1\x0 + >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive + >30 string Copyright\ 1989-1990\ PKWARE\ Inc. Self-extracting PKZIP archive +@@ -107,7 +108,7 @@ + >>>(0x3c.l+4) leshort 0x200 Intel Itanium + >>>(0x3c.l+22) leshort&0x0100 >0 32-bit + >>>(0x3c.l+22) leshort&0x1000 >0 system file +->>>(0x3c.l+232) lelong >0 Mono/.Net assembly ++>>>(0x3c.l+232) lelong >0 \b, Mono/.Net assembly + + >>>>(0x3c.l+0xf8) string UPX0 \b, UPX compressed + >>>>(0x3c.l+0xf8) search/0x140 PEC2 \b, PECompact2 compressed +@@ -520,6 +521,13 @@ + # Acroread or something files wrongly identified as G3 .pfm + # these have the form \000 \001 any? \002 \000 \000 + # or \000 \001 any? \022 \000 \000 ++0 belong&0xffff00ff 0x00010012 PFM data ++>4 string \000\000 ++>6 string >\060 - %s ++ ++0 belong&0xffff00ff 0x00010002 PFM data ++>4 string \000\000 ++>6 string >\060 - %s + #0 string \000\001 pfm? + #>3 string \022\000\000Copyright\ yes + #>3 string \002\000\000Copyright\ yes +--- src/Makefile.am ++++ src/Makefile.am 2008-04-14 17:14:56.000000000 +0200 +@@ -1,4 +1,4 @@ +-MAGIC = $(pkgdatadir)/magic ++MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic + lib_LTLIBRARIES = libmagic.la + include_HEADERS = magic.h + +--- src/dcore.c ++++ src/dcore.c 2006-03-27 13:29:19.000000000 +0200 +@@ -0,0 +1,207 @@ ++/* ++ * Show goo about ELF core files ++ * Jeremy Fitzhardinge <jeremy(a)zip.com.au> 1996 ++ */ ++#include <unistd.h> ++#include <fcntl.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <string.h> ++#if defined __GLIBC__ && __GLIBC__ >= 2 ++#include <elf.h> ++#include <sys/procfs.h> ++# ifndef NT_PRFPREG ++# define NT_PRFPREG 2 ++# endif ++# ifndef NT_TASKSTRUCT ++# define NT_TASKSTRUCT 4 ++# endif ++#else ++#include <linux/elf.h> ++#include <linux/elfcore.h> ++#endif ++ ++static void fperror(const char *str) ++{ ++ perror(str); ++ exit(1); ++} ++ ++static size_t myread(int fd, void *buf, size_t sz) ++{ ++ size_t ret; ++ ++ if ((ret = read(fd, buf, sz)) != sz) ++ fperror("read failed"); ++ return ret; ++} ++ ++static void print_prstatus(const prstatus_t *pr) ++{ ++ unsigned i; ++ static const char *regs[] = { "ebx", "ecx", "edx", "esi", "edi", "ebp", ++ "eax", "ds", "es", "fs", "gs", ++ "orig_eax", "eip", "cs", ++ "efl", "uesp", "ss"}; ++ ++ printf(" pid=%d ppid=%d pgrp=%d sid=%d\n", ++ pr->pr_pid, pr->pr_ppid, pr->pr_pgrp, pr->pr_sid); ++ for(i = 0; i < NGREG; i++) ++ { ++ unsigned long val = pr->pr_reg[i]; ++ printf(" %-2u %-5s=%08lx %lu\n", i, regs[i], val, val); ++ } ++} ++ ++static void print_prpsinfo(const prpsinfo_t *ps) ++{ ++ printf(" uid=%d gid=%d\n", ps->pr_uid, ps->pr_gid); ++ printf(" comm=%s\n", ps->pr_fname); ++ printf(" psargs=%s\n", ps->pr_psargs); ++} ++ ++#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) ++ ++static void do_note(int fd, Elf32_Phdr *phdr) ++{ ++ off_t here = lseek(fd, 0, SEEK_CUR); ++ int size = phdr->p_filesz; ++ char *raw = alloca(size), *end; ++ end = raw+size; ++ ++ lseek(fd, phdr->p_offset, SEEK_SET); ++ myread(fd, raw, size); ++ ++ while(raw < end) ++ { ++ Elf32_Nhdr *note = (Elf32_Nhdr *)raw; ++ const char *str; ++ const char *name, *desc; ++ ++ raw += sizeof(*note); ++ name = raw; ++ raw += roundup(note->n_namesz, sizeof(long)); ++ desc = raw; ++ raw += roundup(note->n_descsz, sizeof(long)); ++ ++ printf(" name=%.*s", (int)note->n_namesz, name); ++ ++ if(strncmp(name, "CORE", note->n_namesz) != 0) ++ { ++ printf("\n"); ++ continue; ++ } ++ ++ switch(note->n_type) ++ { ++#define X(x) case x: str = #x; break; ++ X(NT_PRSTATUS); ++ X(NT_PRFPREG); ++ X(NT_PRPSINFO); ++ X(NT_TASKSTRUCT); ++#undef X ++ default: ++ str = "???"; ++ } ++ printf(" n_type=%s n_descsz=%ld\n", ++ str, note->n_descsz); ++ switch(note->n_type) ++ { ++ case NT_PRSTATUS: ++ print_prstatus((prstatus_t *)desc); ++ break; ++ case NT_PRPSINFO: ++ print_prpsinfo((prpsinfo_t *)desc); ++ break; ++ } ++ } ++ lseek(fd, here, SEEK_SET); ++} ++ ++int main(int argc, char *argv[]) ++{ ++ int fd; ++ Elf32_Ehdr elf; ++ int i; ++ ++ if (argc != 2) ++ { ++ fprintf(stderr, "Usage: %s corefile\n", argv[0]); ++ exit(1); ++ } ++ ++ if ((fd = open(argv[1], O_RDONLY)) == -1) ++ fperror("open of core"); ++ ++ myread(fd, &elf, sizeof(elf)); ++ ++ if (memcmp(ELFMAG, elf.e_ident, SELFMAG) != 0) ++ printf("bad magic\n"); ++ ++ if (elf.e_ident[EI_CLASS] != ELFCLASS32) ++ printf("wrong class\n"); ++ ++ if (elf.e_ident[EI_DATA] != ELFDATA2LSB) ++ printf("wrong endianess\n"); ++ ++ if (elf.e_ident[EI_VERSION] != EV_CURRENT) ++ printf("wrong version\n"); ++ ++ { ++ const char *str; ++ switch(elf.e_type) ++ { ++#define C(x) case ET_##x: str = #x; break; ++ C(NONE); ++ C(REL); ++ C(EXEC); ++ C(DYN); ++ C(CORE); ++#undef C ++ default: str = "???"; break; ++ } ++ printf("elf file type ET_%s\n", str); ++ } ++ ++ if (elf.e_machine != EM_386 && elf.e_machine != EM_486) ++ printf("not i386 or i486\n"); ++ ++ if (elf.e_ehsize != sizeof(elf)) ++ printf("wrong header size\n"); ++ ++ if (elf.e_phentsize != sizeof(Elf32_Phdr)) ++ printf("wrong phdr size\n"); ++ ++ if (lseek(fd, elf.e_phoff, SEEK_SET) != (off_t)elf.e_phoff) ++ fperror("lseek to phdr failed\n"); ++ ++ for(i = 0; i < elf.e_phnum; i++) ++ { ++ Elf32_Phdr phdr; ++ const char *str; ++ ++ myread(fd, &phdr, sizeof(phdr)); ++ switch(phdr.p_type) ++ { ++#define C(x) case PT_##x: str = #x; break; ++ C(NULL); ++ C(LOAD); ++ C(DYNAMIC); ++ C(INTERP); ++ C(NOTE); ++ C(SHLIB); ++ C(PHDR); ++#undef C ++ default: ++ str = "???"; break; ++ } ++ printf("type PT_%s off=%ld vaddr=%lx filesz=%ld flags=%lx\n", ++ str, phdr.p_offset, phdr.p_vaddr, phdr.p_filesz, ++ (unsigned long)phdr.p_flags); ++ if (phdr.p_type == PT_NOTE) ++ do_note(fd, &phdr); ++ } ++ exit(0); ++} ++ ++++++ file-4.24-exec.dif -> file-5.02-exec.dif ++++++ --- file/file-4.24-exec.dif 2008-07-23 18:34:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.02-exec.dif 2009-05-05 14:43:34.000000000 +0200 @@ -1,74 +1,74 @@ --- magic/Magdir/commands -+++ magic/Magdir/commands 2008-04-14 17:27:49.969133137 +0200 -@@ -3,81 +3,81 @@ ++++ magic/Magdir/commands 2009-05-05 14:01:03.253902298 +0200 +@@ -3,66 +3,66 @@ # commands: file(1) magic for various shells and interpreters # #0 string : shell archive or script for antique kernel text -0 string/b #!\ /bin/sh POSIX shell script text executable +0 string/b #!\ /bin/sh POSIX shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /bin/csh C shell script text executable +0 string/b #!\ /bin/csh C shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript # korn shell magic, sent by George Wu, gwu(a)clyde.att.com -0 string/b #!\ /bin/ksh Korn shell script text executable +0 string/b #!\ /bin/ksh Korn shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /bin/tcsh Tenex C shell script text executable +0 string/b #!\ /bin/tcsh Tenex C shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable +0 string/b #!\ /usr/bin/tcsh Tenex C shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable +0 string/b #!\ /usr/local/tcsh Tenex C shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable +0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript # # zsh/ash/ae/nawk/gawk magic from cameron(a)cs.unsw.oz.au (Cameron Simpson) -0 string/b #!\ /bin/zsh Paul Falstad's zsh script text executable +0 string/b #!\ /bin/zsh Paul Falstad's zsh script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /usr/bin/zsh Paul Falstad's zsh script text executable +0 string/b #!\ /usr/bin/zsh Paul Falstad's zsh script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable +0 string/b #!\ /usr/local/bin/zsh Paul Falstad's zsh script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /usr/local/bin/ash Neil Brown's ash script text executable +0 string/b #!\ /usr/local/bin/ash Neil Brown's ash script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /usr/local/bin/ae Neil Brown's ae script text executable +0 string/b #!\ /usr/local/bin/ae Neil Brown's ae script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /bin/nawk new awk script text executable +0 string/b #!\ /bin/nawk new awk script text - !:mime application/x-nawk + !:mime text/x-nawk -0 string/b #!\ /usr/bin/nawk new awk script text executable +0 string/b #!\ /usr/bin/nawk new awk script text - !:mime application/x-nawk + !:mime text/x-nawk -0 string/b #!\ /usr/local/bin/nawk new awk script text executable +0 string/b #!\ /usr/local/bin/nawk new awk script text - !:mime application/x-nawk + !:mime text/x-nawk -0 string/b #!\ /bin/gawk GNU awk script text executable +0 string/b #!\ /bin/gawk GNU awk script text - !:mime application/x-gawk + !:mime text/x-gawk -0 string/b #!\ /usr/bin/gawk GNU awk script text executable +0 string/b #!\ /usr/bin/gawk GNU awk script text - !:mime application/x-gawk + !:mime text/x-gawk -0 string/b #!\ /usr/local/bin/gawk GNU awk script text executable +0 string/b #!\ /usr/local/bin/gawk GNU awk script text - !:mime application/x-gawk + !:mime text/x-gawk # -0 string/b #!\ /bin/awk awk script text executable +0 string/b #!\ /bin/awk awk script text - !:mime application/x-awk + !:mime text/x-awk -0 string/b #!\ /usr/bin/awk awk script text executable +0 string/b #!\ /usr/bin/awk awk script text - !:mime application/x-awk + !:mime text/x-awk # update to distinguish from *.vcf files # this is broken because postscript has /EBEGIN{ for example. #0 search/Bb BEGIN { awk script text @@ -78,60 +78,53 @@ +0 string/b #!\ /bin/rc Plan 9 rc shell script text # bash shell magic, from Peter Tobias (tobias(a)server.et-inf.fho-emden.de) --0 string/b #!\ /bin/bash Bourne-Again shell script text executable -+0 string/b #!\ /bin/bash Bourne-Again shell script text - !:mime application/x-shellscript +-0 string/b #!\ /bin/bash Bourne-Again shell script text executable ++0 string/b #!\ /bin/bash Bourne-Again shell script text + !:mime text/x-shellscript -0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable +0 string/b #!\ /usr/bin/bash Bourne-Again shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable +0 string/b #!\ /usr/local/bash Bourne-Again shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript -0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable +0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text - !:mime application/x-shellscript + !:mime text/x-shellscript # using env - 0 string #!/usr/bin/env a -->15 string >\0 %s script text executable -+>15 string >\0 %s script text - 0 string #!\ /usr/bin/env a -->16 string >\0 %s script text executable -+>16 string >\0 %s script text - - # PHP scripts - # Ulf Harnhammar <ulfh(a)update.uu.se> - 0 search/1/c =<?php PHP script text - 0 search/1 =<?\n PHP script text +@@ -79,9 +79,9 @@ + !:mime text/x-php 0 search/1 =<?\r PHP script text + !:mime text/x-php -0 search/1/b #!\ /usr/local/bin/php PHP script text executable --0 search/1/b #!\ /usr/bin/php PHP script text executable +0 search/1/b #!\ /usr/local/bin/php PHP script text + !:mime text/x-php +-0 search/1/b #!\ /usr/bin/php PHP script text executable +0 search/1/b #!\ /usr/bin/php PHP script text + !:mime text/x-php 0 string Zend\x00 PHP script Zend Optimizer data - --- magic/Magdir/perl -+++ magic/Magdir/perl 2008-04-14 17:27:55.265811334 +0200 ++++ magic/Magdir/perl 2009-05-05 14:01:33.658402106 +0200 @@ -4,15 +4,15 @@ # The `eval' lines recognizes an outrageously clever hack. # Keith Waclena <keith(a)cerberus.uchicago.edu> # Send additions to <perl5-porters(a)perl.org> -0 search/1/b #!\ /bin/perl Perl script text executable +0 search/1/b #!\ /bin/perl Perl script text - !:mime application/x-perl + !:mime text/x-perl 0 search/1 eval\ "exec\ /bin/perl Perl script text - !:mime application/x-perl + !:mime text/x-perl -0 search/1/b #!\ /usr/bin/perl Perl script text executable +0 search/1/b #!\ /usr/bin/perl Perl script text - !:mime application/x-perl + !:mime text/x-perl 0 search/1 eval\ "exec\ /usr/bin/perl Perl script text - !:mime application/x-perl + !:mime text/x-perl -0 search/1/b #!\ /usr/local/bin/perl Perl script text executable +0 search/1/b #!\ /usr/local/bin/perl Perl script text - !:mime application/x-perl + !:mime text/x-perl 0 search/1 eval\ "exec\ /usr/local/bin/perl Perl script text - !:mime application/x-perl + !:mime text/x-perl --- magic/Magdir/python +++ magic/Magdir/python 2006-03-24 14:51:26.000000000 +0100 @@ -4,7 +4,7 @@ ++++++ file-4.24-javacheck.dif -> file-5.02-javacheck.dif ++++++ --- file/file-4.24-javacheck.dif 2008-08-21 18:07:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.02-javacheck.dif 2009-05-05 14:43:36.000000000 +0200 @@ -1,16 +1,11 @@ --- magic/Magdir/cafebabe -+++ magic/Magdir/cafebabe -@@ -12,10 +12,10 @@ ++++ magic/Magdir/cafebabe 2009-05-05 14:11:37.858402267 +0200 +@@ -12,7 +12,7 @@ # (and use as a hack). Let's not use 18, because the Mach-O people # might add another one or two as time goes by... # --0 beshort 0xcafe -->2 beshort 0xbabe -+0 beshort 0xcafe cafe -+>2 beshort 0xbabe babe +-0 belong 0xcafebabe ++0 belong 0xcafebabe cafebabe !:mime application/x-java-applet -->>2 belong >30 compiled Java class data, -+>>4 belong >30 compiled Java class data, - >>>6 beshort x version %d. - >>>4 beshort x \b%d - >>4 belong 1 Mach-O fat file with 1 architecture + >4 belong >30 compiled Java class data, + >>6 beshort x version %d. ++++++ file-4.24-misc.dif -> file-5.02-misc.dif ++++++ --- file/file-4.24-misc.dif 2008-07-23 18:34:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.02-misc.dif 2009-05-05 14:43:37.000000000 +0200 @@ -1,5 +1,5 @@ --- magic/Magdir/audio -+++ magic/Magdir/audio 2008-04-14 16:17:58.871499001 +0200 ++++ magic/Magdir/audio 2008-04-14 16:17:59.000000000 +0200 @@ -116,7 +116,7 @@ # Real Audio (Magic .ra\0375) 0 belong 0x2e7261fd RealAudio sound file @@ -46,27 +46,29 @@ >0 byte ^0x80 executable >16 belong >0 not stripped --- magic/Magdir/commands -+++ magic/Magdir/commands 2008-04-14 16:19:46.441325515 +0200 ++++ magic/Magdir/commands 2009-05-05 13:57:30.778196178 +0200 @@ -12,6 +12,8 @@ - !:mime application/x-shellscript + !:mime text/x-shellscript 0 string/b #!\ /bin/tcsh Tenex C shell script text executable - !:mime application/x-shellscript + !:mime text/x-shellscript +0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable -+!:mime application/x-shellscript ++!:mime text/x-shellscript 0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable - !:mime application/x-shellscript + !:mime text/x-shellscript 0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable -@@ -56,6 +58,10 @@ +@@ -54,7 +56,11 @@ + 0 string/b #!\ /bin/rc Plan 9 rc shell script text executable + # bash shell magic, from Peter Tobias (tobias(a)server.et-inf.fho-emden.de) - 0 string/b #!\ /bin/bash Bourne-Again shell script text executable - !:mime application/x-shellscript +-0 string/b #!\ /bin/bash Bourne-Again shell script text executable ++0 string/b #!\ /bin/bash Bourne-Again shell script text executable ++!:mime text/x-shellscript +0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable -+!:mime application/x-shellscript ++!:mime text/x-shellscript +0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable -+!:mime application/x-shellscript + !:mime text/x-shellscript 0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable - !:mime application/x-shellscript - + !:mime text/x-shellscript --- magic/Magdir/mach +++ magic/Magdir/mach 2003-12-08 17:50:03.000000000 +0100 @@ -74,7 +74,7 @@ @@ -80,7 +82,7 @@ >4 belong 17 rs6000 --- magic/Magdir/msdos +++ magic/Magdir/msdos 2005-07-25 15:24:04.000000000 +0200 -@@ -256,7 +256,7 @@ +@@ -271,7 +271,7 @@ # a few unknown ZIP sfxes, no idea if they are needed or if they are # already captured by the generic patterns above ++++++ file-4.21-option.dif -> file-5.02-option.dif ++++++ --- file/file-4.21-option.dif 2008-07-23 18:34:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.02-option.dif 2009-05-05 14:43:39.000000000 +0200 @@ -1,6 +1,6 @@ --- src/file.c -+++ src/file.c 2007-06-06 16:33:10.402651296 +0200 -@@ -240,6 +240,8 @@ main(int argc, char *argv[]) ++++ src/file.c 2009-05-05 14:05:15.133901855 +0200 +@@ -214,6 +214,8 @@ main(int argc, char *argv[]) flags |= MAGIC_DEBUG|MAGIC_CHECK; break; case 'e': @@ -9,15 +9,16 @@ for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++) if (strcmp(nv[i].name, optarg) == 0) break; -@@ -251,13 +253,15 @@ main(int argc, char *argv[]) +@@ -225,7 +227,7 @@ main(int argc, char *argv[]) break; - + case 'f': - if(action) + if(action || !optarg) usage(); - load(magicfile, flags); - unwrap(optarg); + if (magic == NULL) + if ((magic = load(magicfile, flags)) == NULL) +@@ -234,6 +236,8 @@ main(int argc, char *argv[]) ++didsomefiles; break; case 'F': @@ -26,7 +27,7 @@ separator = optarg; break; case 'i': -@@ -267,6 +271,8 @@ main(int argc, char *argv[]) +@@ -243,6 +247,8 @@ main(int argc, char *argv[]) flags |= MAGIC_CONTINUE; break; case 'm': ++++++ file-4.24.tar.bz2 -> file-5.02.tar.bz2 ++++++ ++++ 27915 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 exiv2 for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package exiv2 for openSUSE:Factory checked in at Wed May 6 18:37:59 CEST 2009. -------- --- exiv2/exiv2.changes 2009-02-16 08:12:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/exiv2/exiv2.changes 2009-05-05 16:57:46.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 5 16:20:36 CEST 2009 - wstephenson(a)novell.com + +- update to 0.18.1: + * added new 'organize' tool + * bug fixes + * for changelog see http://www.exiv2.org/changelog.html + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- exiv2-0.18.tar.bz2 New: ---- exiv2-0.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exiv2.spec ++++++ --- /var/tmp/diff_new_pack.g16028/_old 2009-05-06 18:37:47.000000000 +0200 +++ /var/tmp/diff_new_pack.g16028/_new 2009-05-06 18:37:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package exiv2 (Version 0.18) +# spec file for package exiv2 (Version 0.18.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ License: GPL v2 or later Group: Development/Libraries/C and C++ Summary: Tool to access image Exif metadata -Version: 0.18 -Release: 2 +Version: 0.18.1 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: exiv2-%version.tar.bz2 Patch1: gcc43.diff @@ -115,6 +115,11 @@ %{_mandir}/man*/* %changelog +* Tue May 05 2009 wstephenson(a)novell.com +- update to 0.18.1: + * added new 'organize' tool + * bug fixes + * for changelog see http://www.exiv2.org/changelog.html * Mon Feb 16 2009 coolo(a)suse.de - forgot one package rename * Sun Feb 15 2009 coolo(a)suse.de ++++++ exiv2-0.18.tar.bz2 -> exiv2-0.18.1.tar.bz2 ++++++ ++++ 72335 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