October 2008 - openSUSE Commits - openSUSE Mailing Lists

commit samba
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package samba checked in at Mon Oct 6 16:19:17 CEST 2008. -------- --- samba/samba.changes 2008-09-20 15:00:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2008-10-03 17:08:18.000000000 +0200 @@ -1,0 +2,48 @@ +Fri Oct 3 16:48:31 CEST 2008 - lmuelle(a)suse.de + +- Only call the stop_on_removal, restart_on_update, or insserv_cleanup macro + if available. + +------------------------------------------------------------------- +Fri Oct 3 15:12:23 CEST 2008 - lmuelle(a)suse.de + +- Only call the fillup_and_insserv or fillup_only macro if available. + +------------------------------------------------------------------- +Fri Oct 3 12:42:13 CEST 2008 - lmuelle(a)suse.de + +- Use package names instead of macros for cp, mkdir, mv, rm, and grep or + instead of the full path to the binary for ln, find and xargs. + +------------------------------------------------------------------- +Fri Oct 3 01:28:07 CEST 2008 - lmuelle(a)suse.de + +- Introduce NET_CFGDIR to fit the needs for a differing location of the + network configuration per vendor. + +------------------------------------------------------------------- +Fri Oct 3 00:59:49 CEST 2008 - lmuelle(a)suse.de + +- Use path macros for cp, mkdir, mv, rm, and grep. + +------------------------------------------------------------------- +Thu Oct 2 21:30:06 CEST 2008 - lmuelle(a)suse.de + +- Only use SUSE rpm macros and SuSEconfig.permissions if available. + +------------------------------------------------------------------- +Mon Sep 29 16:09:11 CEST 2008 - lmuelle(a)suse.de + +- Adopt samba-vscan to build after the change to the bool type define. + +------------------------------------------------------------------- +Wed Sep 24 19:40:30 MDT 2008 - tlaxmeshwar(a)novell.com + +- Fix winbindd crash in an unusual failure mode; (bnc#416598). + +------------------------------------------------------------------- +Mon Sep 22 15:13:40 CEST 2008 - lmuelle(a)suse.de + +- Build cifs.upcall for CentOS 5, Fedora 8 and RHEL 5 and newer too. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.C19263/_old 2008-10-06 16:16:49.000000000 +0200 +++ /var/tmp/diff_new_pack.C19263/_new 2008-10-06 16:16:49.000000000 +0200 @@ -26,13 +26,13 @@ License: GPL v3 or later Url: http://www.samba.org/ Version: 3.2.4 -Release: 1 +Release: 2 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on Provides: samba3-doc = %{version}-%{release} Obsoletes: samba3-doc < %{version} -PreReq: /bin/rm /usr/bin/find /usr/bin/xargs +PreReq: coreutils findutils BuildArch: noarch Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 Source1: vendor-files.tar.bz2 @@ -45,9 +45,9 @@ # requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent %define make_doc 0 %define make_utils 0 -%define make_vscan 0 +%define make_vscan 1 %define make_ldapsmb 1 -%if 0%{?suse_version} > 1020 +%if 0%{?suse_version} > 1020 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500 %define make_cifsupcall 1 %else %define make_cifsupcall 0 @@ -62,6 +62,11 @@ %define CONFIGDIR %{_sysconfdir}/samba %define INITDIR %{_sysconfdir}/init.d %define PIDDIR %{_localstatedir}/run/samba +%if "%{_vendor}" == "suse" +%define NET_CFGDIR network +%else +%define NET_CFGDIR network-scripts +%endif %define idmap_modules idmap_ad,idmap_ldap,idmap_rid %define vfs_modules vfs_cacheprime,vfs_readahead %if 0%{?ul_version} >= 1 @@ -314,7 +319,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.C19263/_old 2008-10-06 16:16:49.000000000 +0200 +++ /var/tmp/diff_new_pack.C19263/_new 2008-10-06 16:16:49.000000000 +0200 @@ -51,12 +51,12 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.4 -Release: 1 +Release: 2 Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron logrotate %endif -PreReq: /bin/cp /bin/mkdir /bin/mv /bin/rm /bin/touch /usr/bin/dirname /usr/bin/grep /usr/sbin/groupadd /usr/bin/tr +PreReq: coreutils grep /usr/sbin/groupadd Summary: A SMB/CIFS File, Print, and Authentication Server Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 Source1: vendor-files.tar.bz2 @@ -71,9 +71,9 @@ # requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent %define make_doc 0 %define make_utils 0 -%define make_vscan 0 +%define make_vscan 1 %define make_ldapsmb 1 -%if 0%{?suse_version} > 1020 +%if 0%{?suse_version} > 1020 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500 %define make_cifsupcall 1 %else %define make_cifsupcall 0 @@ -88,6 +88,11 @@ %define CONFIGDIR %{_sysconfdir}/samba %define INITDIR %{_sysconfdir}/init.d %define PIDDIR %{_localstatedir}/run/samba +%if "%{_vendor}" == "suse" +%define NET_CFGDIR network +%else +%define NET_CFGDIR network-scripts +%endif %define idmap_modules idmap_ad,idmap_ldap,idmap_rid %define vfs_modules vfs_cacheprime,vfs_readahead %if 0%{?ul_version} >= 1 @@ -123,7 +128,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %package client @@ -133,7 +138,7 @@ AutoReqProv: on Provides: smbfs samba3-client = %{version}-%{release} Obsoletes: samba3-client < %{version} -PreReq: %{?insserv_prereq} %{?fillup_prereq} /bin/ln /bin/mkdir /bin/touch /sbin/ldconfig /usr/bin/dirname +PreReq: %{?insserv_prereq} %{?fillup_prereq} coreutils /sbin/ldconfig %if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 Requires: cifs-mount %endif @@ -160,7 +165,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -181,7 +186,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %endif @@ -194,7 +199,7 @@ AutoReqProv: on Provides: samba3-doc = %{version}-%{release} Obsoletes: samba3-doc < %{version} -PreReq: /bin/rm /usr/bin/find /usr/bin/xargs +PreReq: coreutils findutils %description doc This package contains all the Samba documentation as it is not part of @@ -211,7 +216,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %endif @@ -223,8 +228,9 @@ AutoReqProv: on Provides: samba3-krb-printing = %{version}-%{release} Obsoletes: samba3-krb-printing +PreReq: coreutils %if 0%{?suse_version} > 1000 -PreReq: /sbin/conf.d/SuSEconfig.permissions /bin/ln +PreReq: /sbin/conf.d/SuSEconfig.permissions %endif Requires: samba-client >= %{version} @@ -237,7 +243,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %if %{make_utils} @@ -272,7 +278,7 @@ %if 0%{?suse_version} > 1030 Recommends: cron logrotate %endif -PreReq: /bin/ln /sbin/ldconfig /sbin/insserv /bin/rm +PreReq: coreutils /sbin/ldconfig %{?insserv_prereq} %description winbind This is the winbind-daemon and the wbinfo-tool. @@ -283,7 +289,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -318,7 +324,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %else @@ -332,7 +338,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %endif @@ -366,7 +372,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %package -n libnetapi0 @@ -385,7 +391,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %package -n libnetapi-devel @@ -405,7 +411,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -432,7 +438,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %else @@ -446,7 +452,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %endif @@ -477,7 +483,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %if %{make_ldapsmb} @@ -498,7 +504,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %package -n libtalloc-devel @@ -518,7 +524,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %package -n libtdb1 @@ -537,7 +543,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %package -n libtdb-devel @@ -557,7 +563,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %package -n libwbclient0 @@ -576,7 +582,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %package -n libwbclient-devel @@ -596,7 +602,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %package -n ldapsmb @@ -605,7 +611,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 240 +Release: 241 Requires: perl-ldap %description -n ldapsmb @@ -618,7 +624,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %endif @@ -640,7 +646,7 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %endif @@ -670,7 +676,7 @@ -------- Rainer Link <rainer(a)openantivirus.org> -Source Timestamp: 1906 +Source Timestamp: 1931 Branch : 3.2.4 %endif @@ -855,7 +861,7 @@ mkdir -p \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/{pam.d,xinetd.d,logrotate.d} \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/network/{if-{down,up}.d,scripts} \ + ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/{if-{down,up}.d,scripts} \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/permissions.d \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/security \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d \ @@ -947,11 +953,11 @@ cp -p config/dhcp.conf ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf cp -p config/sysconfig.dhcp-samba-client ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/ for script in dhcpcd-hook-samba samba-winbindd; do - cp -p "tools/${script}" "${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/network/scripts/" + cp -p "tools/${script}" "${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/" done # Create ghosts for the symlinks for script in 21-dhcpcd-hook-samba 55-samba-winbindd; do - touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/network/if-{down,up}.d/${script} + touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} done # Add logrotate settings for nmbd and smbd only on systems newer than 8.1. %if 0%{?suse_version} && 0%{?suse_version} < 811 @@ -978,7 +984,7 @@ cp -p docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System cp -p docu/manpages.html ../docs/htmldocs popd -cp -p packaging/Debian/debian-unstable/samba-common.dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/network/scripts/dhcpcd-hook-samba-functions +cp -p packaging/Debian/debian-unstable/samba-common.dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions # libnss_wins.so install -m 0755 source/nsswitch/libnss_wins.so ${RPM_BUILD_ROOT}/%{_lib}/libnss_wins.so.2 # winbind stuff @@ -1118,42 +1124,38 @@ /usr/sbin/groupadd -g 71 -o -r ntadmin 2>/dev/null || : %preun -%stop_on_removal smb nmb +%{?stop_on_removal smb nmb} %postun -%restart_on_update nmb smb -%insserv_cleanup +%{?restart_on_update nmb smb} +%{?insserv_cleanup} %preun client -%stop_on_removal smbfs +%{?stop_on_removal smbfs} %post client /sbin/ldconfig if [ ${1:-0} -eq 1 ]; then # Only insserv smbfs if we're not in update mode. -%if 0%{?suse_version} && 0%{?suse_version} < 1001 -%{fillup_and_insserv -fy smbfs} || : -%else -%fillup_and_insserv -fy smbfs -%endif - ln -fs %{_sysconfdir}/sysconfig/network/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/network/if-down.d/21-dhcpcd-hook-samba - ln -fs %{_sysconfdir}/sysconfig/network/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/network/if-up.d/21-dhcpcd-hook-samba +%{?fillup_and_insserv -fy smbfs} + ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba + ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba else for if_case in if-down.d if-up.d; do - test -h %{_sysconfdir}/sysconfig/network/${if_case}/dhcpcd-hook-samba || \ + test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba || \ continue - rm -f %{_sysconfdir}/sysconfig/network/${if_case}/dhcpcd-hook-samba - ln -fs %{_sysconfdir}/sysconfig/network/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/network/${if_case}/21-dhcpcd-hook-samba + rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba + ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-dhcpcd-hook-samba done fi if ! test -e %{_bindir}/get_printing_ticket; then ln -fs %{_bindir}/smbspool %{_libdir}/cups/backend/smb fi -%fillup_only -nsd dhcp samba-client network +%{?fillup_only -nsd dhcp samba-client network} %postun client /sbin/ldconfig -%insserv_cleanup +%{?insserv_cleanup} %post -n libnetapi0 /sbin/ldconfig @@ -1212,24 +1214,24 @@ %post winbind /sbin/ldconfig if test ${1:-0} -eq 1; then - ln -fs %{_sysconfdir}/sysconfig/network/scripts/samba-winbindd %{_sysconfdir}/sysconfig/network/if-down.d/55-samba-winbindd - ln -fs %{_sysconfdir}/sysconfig/network/scripts/samba-winbindd %{_sysconfdir}/sysconfig/network/if-up.d/55-samba-winbindd + ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/samba-winbindd %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/55-samba-winbindd + ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/samba-winbindd %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/55-samba-winbindd else for if_case in if-down.d if-up.d; do - test -h %{_sysconfdir}/sysconfig/network/${if_case}/samba-winbindd || \ + test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/samba-winbindd || \ continue - rm -f %{_sysconfdir}/sysconfig/network/${if_case}/samba-winbindd - ln -fs %{_sysconfdir}/sysconfig/network/scripts/samba-winbindd %{_sysconfdir}/sysconfig/network/${if_case}/55-samba-winbindd + rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/samba-winbindd + ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/samba-winbindd %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/55-samba-winbindd done fi %preun winbind -%stop_on_removal winbind +%{?stop_on_removal winbind} %postun winbind /sbin/ldconfig -%restart_on_update nscd winbind -%insserv_cleanup +%{?restart_on_update nscd winbind} +%{?insserv_cleanup} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 %post -n cifs-mount @@ -1359,13 +1361,13 @@ %dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap/schema %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema -%ghost %{_sysconfdir}/sysconfig/network/if-down.d/21-dhcpcd-hook-samba -%ghost %{_sysconfdir}/sysconfig/network/if-up.d/21-dhcpcd-hook-samba +%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba +%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/dispatcher.d %{_sysconfdir}/NetworkManager/dispatcher.d/smbfs -%{_sysconfdir}/sysconfig/network/scripts/dhcpcd-hook-samba -%{_sysconfdir}/sysconfig/network/scripts/dhcpcd-hook-samba-functions +%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba +%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions %{_bindir}/eventlogadm %{_bindir}/findsmb %{_bindir}/ldbadd @@ -1468,9 +1470,9 @@ %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/security/pam_winbind.conf %attr(0754,root,root) %config %{INITDIR}/winbind -%ghost %{_sysconfdir}/sysconfig/network/if-down.d/55-samba-winbindd -%ghost %{_sysconfdir}/sysconfig/network/if-up.d/55-samba-winbindd -%{_sysconfdir}/sysconfig/network/scripts/samba-winbindd +%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/55-samba-winbindd +%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/55-samba-winbindd +%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/samba-winbindd %doc %{_mandir}/man1/ntlm_auth.1.* %doc %{_mandir}/man1/wbinfo.1.* %doc %{_mandir}/man8/winbindd.8.* @@ -1632,7 +1634,7 @@ /sbin/umount.cifs %doc %{_mandir}/man8/mount.cifs.8.* %doc %{_mandir}/man8/umount.cifs.8.* -%if 0%{?suse_version} > 1020 +%if %{make_cifsupcall} %{_sbindir}/cifs.upcall %doc %{_mandir}/man8/cifs.upcall.8.* %endif @@ -1645,6 +1647,27 @@ %endif %changelog +* Fri Oct 03 2008 lmuelle(a)suse.de +- Only call the stop_on_removal, restart_on_update, or insserv_cleanup macro + if available. +* Fri Oct 03 2008 lmuelle(a)suse.de +- Only call the fillup_and_insserv or fillup_only macro if available. +* Fri Oct 03 2008 lmuelle(a)suse.de +- Use package names instead of macros for cp, mkdir, mv, rm, and grep or + instead of the full path to the binary for ln, find and xargs. +* Fri Oct 03 2008 lmuelle(a)suse.de +- Introduce NET_CFGDIR to fit the needs for a differing location of the + network configuration per vendor. +* Fri Oct 03 2008 lmuelle(a)suse.de +- Use path macros for cp, mkdir, mv, rm, and grep. +* Thu Oct 02 2008 lmuelle(a)suse.de +- Only use SUSE rpm macros and SuSEconfig.permissions if available. +* Mon Sep 29 2008 lmuelle(a)suse.de +- Adopt samba-vscan to build after the change to the bool type define. +* Thu Sep 25 2008 tlaxmeshwar(a)novell.com +- Fix winbindd crash in an unusual failure mode; (bnc#416598). +* Mon Sep 22 2008 lmuelle(a)suse.de +- Build cifs.upcall for CentOS 5, Fedora 8 and RHEL 5 and newer too. * Sat Sep 20 2008 lmuelle(a)suse.de - Call mkinitrd_setup during %%post and %%postun for post-9.2 systems only. * Sat Sep 20 2008 lmuelle(a)suse.de ++++++ build-source-timestamp ++++++ --- samba/build-source-timestamp 2008-09-21 10:59:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/build-source-timestamp 2008-10-03 23:20:55.000000000 +0200 @@ -1,2 +1,2 @@ -1906 +1931 Branch : 3.2.4 ++++++ patches.tar.bz2 ++++++ ++++ 6272 lines of diff (skipped) ++++++ vendor-files.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2008-09-21 10:59:45.000000000 +0200 +++ new/vendor-files/tools/package-data 2008-10-03 23:20:55.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="1906" +SAMBA_PACKAGE_SVN_VERSION="1931" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 anjuta
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package anjuta checked in at Mon Oct 6 16:16:13 CEST 2008. -------- --- GNOME/anjuta/anjuta.changes 2008-09-04 16:34:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/anjuta/anjuta.changes 2008-09-29 22:58:23.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Sep 30 06:54:31 WST 2008 - mboman(a)suse.de + +- Update to version 2.24.0.1: + + New version of symbol-db plugin beta + + Fix warnings, some documents could have no associated file + + Fix bgo#529468: Use weak pointers to avoid acting on widgets that have + been destroyed. + + Fix bgo#551574 Project names and descriptions are not translatable + + Fix bgo#551684: Wrong AC substitutions in anjuta-version.h. + + Fixed a problem with async file loading. + + Fix libanjuta API documentation + + Imported new symbol icons from MonoDevelop. + + Fix bgo#550322 - Newlines should be placed at the end of error messages + lines + + Fix bgo#550470 - Crash: Executing file through popup menu + + Use the View->Editor->* menu items for view spaces, view eol and + line wrap (new) option instead of the preferences. + + Fix bgo#549950 - crash while saving a file + + Translation updates + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- anjuta-2.23.91.tar.bz2 New: ---- anjuta-2.24.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anjuta.spec ++++++ --- /var/tmp/diff_new_pack.a15126/_old 2008-10-06 16:15:57.000000000 +0200 +++ /var/tmp/diff_new_pack.a15126/_new 2008-10-06 16:15:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package anjuta (Version 2.23.91) +# spec file for package anjuta (Version 2.24.0.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -94,7 +94,7 @@ Recommends: libgnomeui-doc Recommends: libgnomeprint-doc Recommends: libgnomeprintui-doc -Version: 2.23.91 +Version: 2.24.0.1 Release: 1 Requires: %{name}-lang = %{version} Summary: GNOME IDE for C and C++ @@ -265,7 +265,25 @@ %files lang -f %name.lang %changelog -* Thu Sep 04 2008 maw(a)suse.de +* Tue Sep 30 2008 mboman(a)suse.de +- Update to version 2.24.0.1: + + New version of symbol-db plugin beta + + Fix warnings, some documents could have no associated file + + Fix bgo#529468: Use weak pointers to avoid acting on widgets that have + been destroyed. + + Fix bgo#551574 Project names and descriptions are not translatable + + Fix bgo#551684: Wrong AC substitutions in anjuta-version.h. + + Fixed a problem with async file loading. + + Fix libanjuta API documentation + + Imported new symbol icons from MonoDevelop. + + Fix bgo#550322 - Newlines should be placed at the end of error messages + lines + + Fix bgo#550470 - Crash: Executing file through popup menu + + Use the View->Editor->* menu items for view spaces, view eol and + line wrap (new) option instead of the preferences. + + Fix bgo#549950 - crash while saving a file + + Translation updates +* Fri Sep 05 2008 maw(a)suse.de - Update to version 2.23.91: + The large version bump is due to Anjuta synchronizing its version numbers with those of GNOME at large @@ -282,7 +300,7 @@ - Clean up Requires by removing libraries when the devel package of the libraries are already in Requires - Run ldconfig in %%post(un) -* Mon Mar 31 2008 vuntz(a)suse.de +* Tue Apr 01 2008 vuntz(a)suse.de - Updated to version 2.4.0. Too many changes and bugfixes to list here. - Remove anjuta-64bit-warning.patch (fixed upstream), @@ -291,16 +309,16 @@ (fixed upstream) * Wed Feb 06 2008 rodrigo(a)suse.de - Added patches to fix build failures -* Mon Feb 04 2008 ro(a)suse.de +* Tue Feb 05 2008 ro(a)suse.de - disable parallel make for the moment -* Mon Feb 04 2008 rodrigo(a)suse.de +* Tue Feb 05 2008 rodrigo(a)suse.de - Fixed path for Glade catalog files * Fri Feb 01 2008 rodrigo(a)suse.de - Update to version 2.3.3: * http://ftp.acc.umu.se/pub/GNOME/sources/anjuta/2.3/anjuta-2.3.3.news * Thu Jan 31 2008 sbrabec(a)suse.cz - Devhelp documentation moved to the separate package (bnc#248813). -* Thu Nov 01 2007 sbrabec(a)suse.cz +* Fri Nov 02 2007 sbrabec(a)suse.cz - Build with gtksourceview18. * Fri Oct 26 2007 sbrabec(a)suse.cz - Require autogen (#336176). @@ -308,12 +326,12 @@ * Wed Oct 24 2007 sbrabec(a)suse.cz - Build all optional plugins except GtkSourceView: subversion, glade, class inheritance, performance profiler, Valgrind. -* Tue Oct 23 2007 maw(a)suse.de +* Wed Oct 24 2007 maw(a)suse.de - Update to version 2.2.2: + Bugs (bugzilla.gnome.org) fixed: #477976, #427104, #479020, [#478238], #456465, #466031, #343522, #487112, #486597, #482067, [#477976], #427104, #487854, #474811, #488061, and #488928. -* Wed Oct 17 2007 maw(a)suse.de +* Thu Oct 18 2007 maw(a)suse.de - Add gdl-devel and libxslt-devel to the list of build requirements - Remove configure.patch - Don't attempt to install files that don't exist @@ -321,9 +339,9 @@ - Add abuild.patch - Add no-bins-in-usrshare.patch - Minor .spec cleanups. -* Thu Oct 11 2007 sbrabec(a)suse.cz +* Fri Oct 12 2007 sbrabec(a)suse.cz - Removed bogus dependency on mDNSResponder. -* Mon Oct 08 2007 mauro(a)suse.de +* Tue Oct 09 2007 mauro(a)suse.de - Update to version 2.2.1: * Fixed lots of memory leaks (thanks valgrind) * Fixed crasher on shutdown @@ -339,12 +357,12 @@ * Fixed bug #450217: Refreshing tree brings to random crashes * Fixed bug 453931 - crash in Anjuta IDE: Trying some c++ exampled * Fixed bug 457093 - crash in Anjuta IDE: just typed in some text -* Fri Aug 10 2007 coolo(a)suse.de +* Sat Aug 11 2007 coolo(a)suse.de - put the Version before the use of %%version -* Mon Aug 06 2007 maw(a)suse.de +* Tue Aug 07 2007 maw(a)suse.de - Split out a -lang subpackage - Use %%fupes. -* Mon Jun 18 2007 maw(a)suse.de +* Tue Jun 19 2007 maw(a)suse.de - Add abuild.patch (#241836). * Mon Apr 23 2007 pgajdos(a)suse.cz - fixed new gcc warnings @@ -355,33 +373,33 @@ * Thu Jan 04 2007 sbrabec(a)suse.cz - Prefix changed to /usr. - Spec file cleanup. -* Sun Oct 15 2006 schwab(a)suse.de +* Mon Oct 16 2006 schwab(a)suse.de - Make sure config.rpath is present. * Fri Feb 24 2006 sbrabec(a)suse.cz - Improved Categories. -* Fri Feb 17 2006 sreeves(a)suse.de +* Sat Feb 18 2006 sreeves(a)suse.de - Update .desktop file (Name, GenericName, Comment, DocPath) -* Wed Jan 25 2006 mls(a)suse.de +* Thu Jan 26 2006 mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jan 18 2006 sbrabec(a)suse.cz - Updated to version 1.2.4a. -* Wed Nov 02 2005 dmueller(a)suse.de +* Thu Nov 03 2005 dmueller(a)suse.de - don't build as root * Wed Oct 26 2005 sbrabec(a)suse.cz - Updated to version 1.2.4 (#118228). * Tue Aug 02 2005 ro(a)suse.de - intltoolize with force -* Mon Jun 20 2005 sbrabec(a)suse.cz +* Tue Jun 21 2005 sbrabec(a)suse.cz - Removed mkinstalldirs patch - fixed upstream (#56985). -* Mon May 16 2005 sbrabec(a)suse.cz +* Tue May 17 2005 sbrabec(a)suse.cz - Updated to version 1.2.3. * Wed Apr 27 2005 meissner(a)suse.de - fixed buffer overflow and one aliasing issue. -* Tue Apr 05 2005 sbrabec(a)suse.cz +* Wed Apr 06 2005 sbrabec(a)suse.cz - Do not require linc. -* Sun Nov 07 2004 ro(a)suse.de +* Mon Nov 08 2004 ro(a)suse.de - make it build with new intltool -* Mon Oct 25 2004 ro(a)suse.de +* Tue Oct 26 2004 ro(a)suse.de - locale rename: no -> nb * Tue Sep 07 2004 sbrabec(a)suse.cz - Generated shared mime info. @@ -390,12 +408,12 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=987912&group_id=14… - Added gnome-terminal, yelp and devhelp to Requires. - Added *-doc GNOME developer documentation to Requires. -* Tue Jun 15 2004 sbrabec(a)suse.cz +* Wed Jun 16 2004 sbrabec(a)suse.cz - Worked around missing mkinstalldirs (#42037, #41985). * Thu Jun 10 2004 sbrabec(a)suse.cz - Updated to version 1.2.2. - Fixed IA64 crash on start (#41854). -* Sun Apr 25 2004 ro(a)suse.de +* Mon Apr 26 2004 ro(a)suse.de - fix function return type to void * Wed Mar 17 2004 sbrabec(a)suse.cz - Fixed scrollkeeper calling conventions (#36215). @@ -403,20 +421,20 @@ - FHS 2.3 fix (mandir, infodir, #35821). * Mon Mar 15 2004 sbrabec(a)suse.cz - Added package set sufficient for compilation to requirements (#35900), -* Wed Feb 18 2004 ro(a)suse.de +* Thu Feb 19 2004 ro(a)suse.de - fix plugindir for lib64 * Thu Feb 12 2004 sbrabec(a)suse.cz - Updated to version 1.2.1 (GNOME2). - Added anjuta_update_global_tags. -* Sat Aug 16 2003 adrian(a)suse.de +* Sun Aug 17 2003 adrian(a)suse.de - add Categories -* Thu Jul 24 2003 hhetter(a)suse.de +* Fri Jul 25 2003 hhetter(a)suse.de - %%_lib fixes * Mon Jul 14 2003 sbrabec(a)suse.cz - GNOME prefix change to /opt/gnome. -* Thu Jun 19 2003 ro(a)suse.de +* Fri Jun 20 2003 ro(a)suse.de - added directory to filelist -* Mon Jun 02 2003 ro(a)suse.de +* Tue Jun 03 2003 ro(a)suse.de - add manpages to filelist - remove unpackaged files from buildroot * Mon Nov 11 2002 ro(a)suse.de @@ -435,15 +453,15 @@ - removed gnome-utils from neededforbuild * Tue Aug 13 2002 hhetter(a)suse.de - fix neededforbuild -* Fri Jul 26 2002 adrian(a)suse.de +* Sat Jul 27 2002 adrian(a)suse.de - fix neededforbuild * Mon Jul 01 2002 meissner(a)suse.de - auto* rerun, added intltool to neededforbuild * Mon Jul 01 2002 hhetter(a)suse.de - updated to version 0.1.9 -* Mon May 27 2002 ro(a)suse.de +* Tue May 28 2002 ro(a)suse.de - removed gpc from neededforbuild -* Thu Jan 31 2002 ro(a)suse.de +* Fri Feb 01 2002 ro(a)suse.de - changed neededforbuild <libpng> to <libpng-devel-packages> * Wed Dec 05 2001 hhetter(a)suse.de - update to version 0.1.8 @@ -460,7 +478,7 @@ - updated to version 0.1.6 * Wed Jun 20 2001 hhetter(a)suse.de - fixed redundand docdir -* Thu Apr 05 2001 uli(a)suse.de +* Fri Apr 06 2001 uli(a)suse.de - ditched reimplementation of strcasestr (harmful with recent gccs) - fixed passing of RPM_OPT_FLAGS * Thu Mar 29 2001 hhetter(a)suse.de ++++++ anjuta-2.23.91.tar.bz2 -> anjuta-2.24.0.1.tar.bz2 ++++++ GNOME/anjuta/anjuta-2.23.91.tar.bz2 /mounts/work_src_done/STABLE/anjuta/anjuta-2.24.0.1.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 aaa_base
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package aaa_base checked in at Mon Oct 6 16:15:49 CEST 2008. -------- --- aaa_base/aaa_base.changes 2008-09-29 08:33:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2008-10-02 15:37:07.732060000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 2 12:21:45 CEST 2008 - werner(a)suse.de + +- Do not set TEXINPUTS to make luatex work (bnc#429345) +- Use /bin/grep in profile.csh (bnc#429336) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.j10698/_old 2008-10-06 16:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.j10698/_new 2008-10-06 16:14:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package aaa_base (Version 11.0.42) +# spec file for package aaa_base (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,8 @@ Recommends: cron logrotate PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on -Version: 11.0.42 -Release: 46 +Version: 11.1 +Release: 1 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -150,6 +150,9 @@ %defattr(-,root,root) %changelog +* Thu Oct 02 2008 werner(a)suse.de +- Do not set TEXINPUTS to make luatex work (bnc#429345) +- Use /bin/grep in profile.csh (bnc#429336) * Fri Sep 26 2008 dmueller(a)suse.de - update chkconfig manpage (bnc#411221) * Thu Sep 11 2008 mkoenig(a)suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/csh.login new/aaa_base/etc/csh.login --- old/aaa_base/etc/csh.login 2008-07-28 13:10:25.000000000 +0200 +++ new/aaa_base/etc/csh.login 2008-10-02 12:21:17.000000000 +0200 @@ -144,13 +144,13 @@ if ( -r /etc/inputrc && ! ${?INPUTRC} ) setenv INPUTRC /etc/inputrc # -# Set some environment variables for TeX/LaTeX +# Set some environment variables for TeX/LaTeX (Not used due luatex) # -if ( ${?TEXINPUTS} ) then - setenv TEXINPUTS ":${TEXINPUTS}:${HOME}/.TeX:/usr/share/doc/.TeX:/usr/doc/.TeX" -else - setenv TEXINPUTS ":${HOME}/.TeX:/usr/share/doc/.TeX:/usr/doc/.TeX" -endif +#if ( ${?TEXINPUTS} ) then +# setenv TEXINPUTS ":${TEXINPUTS}:${HOME}/.TeX:/usr/share/doc/.TeX:/usr/doc/.TeX" +#else +# setenv TEXINPUTS ":${HOME}/.TeX:/usr/share/doc/.TeX:/usr/doc/.TeX" +#endif # # Configure the default pager on SuSE Linux diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile new/aaa_base/etc/profile --- old/aaa_base/etc/profile 2008-07-28 13:11:49.000000000 +0200 +++ new/aaa_base/etc/profile 2008-10-02 12:20:50.000000000 +0200 @@ -184,14 +184,14 @@ fi # -# Set some environment variables for TeX/LaTeX +# Set some environment variables for TeX/LaTeX (Not used due luatex) # -if test -n "$TEXINPUTS" ; then - TEXINPUTS=":$TEXINPUTS:$HOME/.TeX:/usr/share/doc/.TeX:/usr/doc/.TeX" -else - TEXINPUTS=":$HOME/.TeX:/usr/share/doc/.TeX:/usr/doc/.TeX" -fi -export TEXINPUTS +#if test -n "$TEXINPUTS" ; then +# TEXINPUTS=":$TEXINPUTS:$HOME/.TeX:/usr/share/doc/.TeX:/usr/doc/.TeX" +#else +# TEXINPUTS=":$HOME/.TeX:/usr/share/doc/.TeX:/usr/doc/.TeX" +#fi +#export TEXINPUTS # # Configure the default pager on SuSE Linux diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/profile.csh new/aaa_base/etc/profile.d/profile.csh --- old/aaa_base/etc/profile.d/profile.csh 2007-01-29 15:54:37.000000000 +0100 +++ new/aaa_base/etc/profile.d/profile.csh 2008-10-02 15:36:10.000000000 +0200 @@ -25,7 +25,7 @@ unset sys set val="" -foreach line ( "`grep -vh '^#' $sysconf`" ) +foreach line ( "`/bin/grep -vh '^#' $sysconf`" ) set val="${line:q:s/=/ /}" set arr=( $val ) eval set val="${arr[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 update-desktop-files
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package update-desktop-files checked in at Mon Oct 6 16:13:52 CEST 2008. -------- --- update-desktop-files/update-desktop-files.changes 2008-09-26 00:50:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/update-desktop-files/update-desktop-files.changes 2008-10-06 16:03:14.303873000 +0200 @@ -1,0 +2,21 @@ +Thu Oct 2 18:16:16 CEST 2008 - vuntz(a)suse.de + +- Add a -t/--trim option to suse_update_desktop_file.sh in order + to trim all translations from a desktop file. The goal is to + have the desktops use gettext to translate data from those files + and to make it easy to update translations by just shipping an + updated mo file. This is for fate#301344. +- This change requires a change in /usr/lib/rpm/suse_macros (rpm + package). + +------------------------------------------------------------------- +Thu Oct 2 17:02:32 CEST 2008 - ke(a)suse.de + +- update translations. + +------------------------------------------------------------------- +Tue Sep 30 10:02:59 CEST 2008 - dmueller(a)suse.de + +- fix mimetype.prov to not break for most KDE packages + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ update-desktop-files.spec ++++++ --- /var/tmp/diff_new_pack.HO5172/_old 2008-10-06 16:10:53.000000000 +0200 +++ /var/tmp/diff_new_pack.HO5172/_new 2008-10-06 16:10:53.000000000 +0200 @@ -20,7 +20,7 @@ Name: update-desktop-files Version: 11.0 -Release: 54 +Release: 55 Summary: A Build Tool to Update Desktop Files License: GPL v2 or later Group: Development/Tools/Building @@ -110,6 +110,18 @@ %defattr(-,root,root) %changelog +* Thu Oct 02 2008 vuntz(a)suse.de +- Add a -t/--trim option to suse_update_desktop_file.sh in order + to trim all translations from a desktop file. The goal is to + have the desktops use gettext to translate data from those files + and to make it easy to update translations by just shipping an + updated mo file. This is for fate#301344. +- This change requires a change in /usr/lib/rpm/suse_macros (rpm + package). +* Thu Oct 02 2008 ke(a)suse.de +- update translations. +* Tue Sep 30 2008 dmueller(a)suse.de +- fix mimetype.prov to not break for most KDE packages * Thu Sep 25 2008 sreeves(a)suse.de - add mimetype.prov to generate mime type rpm provides at build time * Fri Sep 19 2008 ke(a)suse.de ++++++ desktop-translations.tar.bz2 ++++++ update-desktop-files/desktop-translations.tar.bz2 /mounts/work_src_done/STABLE/update-desktop-files/desktop-translations.tar.bz2 differ: byte 11, line 1 ++++++ mimetypes.prov ++++++ --- update-desktop-files/mimetypes.prov 2008-09-12 07:33:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/update-desktop-files/mimetypes.prov 2008-09-30 10:24:58.000000000 +0200 @@ -1,17 +1,17 @@ #!/bin/sh +# vim: sw=4 et # Transform desktop mimetype info into RPM provides OLD_IFS="$IFS" while read instfile ; do - case "$instfile" in - *.desktop) - mime=`cat $instfile | grep MimeType | cut -d'=' -f2` - IFS=';' - for type in $mime ; do - echo 'mimetype('$type')' - done - ;; - esac - done - IFS=$OLD_IFS - + case "$instfile" in + *.desktop) + mime=$(sed -re '/^MimeType *= *([a-zA-Z0-9. _/;-]*)/!d' $instfile | cut -d'=' -f2) + IFS=';' + for type in $mime ; do + echo 'mimetype('$type')' + done + ;; + esac +done +IFS=$OLD_IFS ++++++ suse_update_desktop_file.sh ++++++ --- update-desktop-files/suse_update_desktop_file.sh 2008-03-28 05:05:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/update-desktop-files/suse_update_desktop_file.sh 2008-10-06 16:02:43.875187000 +0200 @@ -13,6 +13,7 @@ # INSTALL=no I18N=yes +TRIM=no CREATE=no RESET=no UNIMPORTANT=no @@ -29,6 +30,10 @@ I18N=no shift continue;; + -t|--trim-i18n) + TRIM=yes + shift + continue;; -i|--install) INSTALL=yes shift @@ -326,19 +331,28 @@ echo "ERROR: $FILE is not an UTF-8 file" exit 1 fi - # - # Merge translations - # - cp $FILE ${FILE}.old - /usr/bin/suse-desktop-merge $FILE > ${FILE}_ || exit 1 - perl /usr/share/update-desktop-files/untranslate.pl ${FILE}_ > ${FILE}.new - if ! cmp -s ${FILE}.old ${FILE}.new; then - echo "UNTRANSLATE DOES NOT WORK" - diff -u ${FILE}.old ${FILE}.new - exit 1 + + if [ "$TRIM" = "no" ]; then + # + # Merge translations + # + cp $FILE ${FILE}.old + /usr/bin/suse-desktop-merge $FILE > ${FILE}_ || exit 1 + perl /usr/share/update-desktop-files/untranslate.pl ${FILE}_ > ${FILE}.new + if ! cmp -s ${FILE}.old ${FILE}.new; then + echo "UNTRANSLATE DOES NOT WORK" + diff -u ${FILE}.old ${FILE}.new + exit 1 + fi + mv ${FILE}_ $FILE + rm -f ${FILE}.old ${FILE}.new + else + # + # Trim translations (desktops will use gettext to find them) + # + grep -v -E '^Name\[|^GenericName\[|^Comment\[' $FILE > ${FILE}_ + mv ${FILE}_ $FILE fi - mv ${FILE}_ $FILE - rm -f ${FILE}.old ${FILE}.new else # # this file will not get translated ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-users
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-users checked in at Mon Oct 6 16:13:25 CEST 2008. -------- --- yast2-users/yast2-users.changes 2008-09-19 14:45:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2008-10-06 16:03:27.193154000 +0200 @@ -1,0 +2,14 @@ +Mon Oct 6 13:01:38 CEST 2008 - jsuchome(a)suse.cz + +- better message when loading package into inst-sys (bnc#432298) +- fingerprint-reader: thinkfinger replaced by fp (fate#300416) +- 2.17.15 + +------------------------------------------------------------------- +Fri Oct 3 12:26:07 CEST 2008 - jsuchome(a)suse.cz + +- added autoYaST support for autologin (bnc#430111) +- UsersSimple: import Stage module before using it (bnc#431890) +- 2.17.14 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-users-2.17.13.tar.bz2 New: ---- yast2-users-2.17.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.Bv4703/_old 2008-10-06 16:10:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Bv4703/_new 2008-10-06 16:10:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-users (Version 2.17.13) +# spec file for package yast2-users (Version 2.17.15) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-users -Version: 2.17.13 +Version: 2.17.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.17.13.tar.bz2 +Source0: yast2-users-2.17.15.tar.bz2 Prefix: /usr BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite Requires: yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext @@ -52,7 +52,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-users-2.17.13 +%setup -n yast2-users-2.17.15 %build %{prefix}/bin/y2tool y2autoconf @@ -95,6 +95,14 @@ %{_libdir}/YaST2/plugin/libpy2ag_crack.la %doc %{prefix}/share/doc/packages/yast2-users %changelog +* Mon Oct 06 2008 jsuchome(a)suse.cz +- better message when loading package into inst-sys (bnc#432298) +- fingerprint-reader: thinkfinger replaced by fp (fate#300416) +- 2.17.15 +* Fri Oct 03 2008 jsuchome(a)suse.cz +- added autoYaST support for autologin (bnc#430111) +- UsersSimple: import Stage module before using it (bnc#431890) +- 2.17.14 * Fri Sep 19 2008 jsuchome(a)suse.cz - detect authentication methods also in 2nd stage (bnc#427256) - 2.17.13 ++++++ yast2-users-2.17.13.tar.bz2 -> yast2-users-2.17.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.13/src/inst_auth.ycp new/yast2-users-2.17.15/src/inst_auth.ycp --- old/yast2-users-2.17.13/src/inst_auth.ycp 2008-09-18 11:32:41.000000000 +0200 +++ new/yast2-users-2.17.15/src/inst_auth.ycp 2008-09-19 14:44:54.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Arvin Schnell <arvin(a)suse.de> * Michal Svec <msvec(a)suse.cz> * - * $Id: inst_auth.ycp 48413 2008-06-19 08:16:54Z jsuchome $ + * $Id: inst_auth.ycp 51319 2008-09-19 12:45:13Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.13/src/Users.pm new/yast2-users-2.17.15/src/Users.pm --- old/yast2-users-2.17.13/src/Users.pm 2008-09-16 15:51:16.000000000 +0200 +++ new/yast2-users-2.17.15/src/Users.pm 2008-10-03 12:31:47.000000000 +0200 @@ -4,7 +4,7 @@ # Package: Configuration of users and groups # Summary: I/O routines + main data structures # -# $Id: Users.pm 51181 2008-09-16 13:51:24Z jsuchome $ +# $Id: Users.pm 51827 2008-10-03 10:33:02Z jsuchome $ # package Users; @@ -6085,12 +6085,30 @@ %useradd_defaults = %{$settings{"user_defaults"}}; $defaults_modified = 1; } + if (defined $settings{"login_settings"} && + ref ($settings{"login_settings"}) eq "HASH") + { + my $autologin = $settings{"login_settings"}; + my $auto_user = $autologin->{"autologin_user"} || ""; + if ($auto_user) { + Autologin->Use (1); + Autologin->user ($auto_user); + } + if (defined $autologin->{"password_less_login"}) { + Autologin->pw_less ($autologin->{"password_less_login"}); + } + } $self->ReadSystemDefaults(1); # remove cache entries (#50265) UsersCache->ResetCache (); + # do not replace possible sysconfig value of autologin (bnc#430111) + if (Mode->autoinst ()) { + Autologin->Read (); + } + my $error_msg = Mode->test () ? "" : $self->ReadLocal (); if ($error_msg) { return 0; @@ -6402,7 +6420,7 @@ foreach my $key (keys %exported_user) { if (defined $keys_to_export{$key}) { my $new_key = $keys_to_export{$key}; - $ret{$new_key} = $exported_user{$key}; + $ret{$new_key} = $exported_user{$key} if defined ($exported_user{$key}); } } @@ -6501,11 +6519,20 @@ } } - return { + my %ret = ( "users" => \@exported_users, "groups" => \@exported_groups, "user_defaults" => \%useradd_defaults - }; + ); + if (Autologin->used ()) { + my %autologin = (); + if (Autologin->pw_less ()) { + $autologin{"password_less_login"} = YaST::YCP::Boolean (1); + } + $autologin{"autologin_user"} = Autologin->user (); + $ret{"login_settings"} = \%autologin; + } + return \%ret; } ##------------------------------------ @@ -6537,6 +6564,13 @@ } } } + if (Autologin->used ()) { + # summary label + $ret .= __("<h3>Login Settings</h3>"); + # summary item, %1 is user name + $ret .= sformat (__("User %1 configured for automatic login"), + Autologin->user ()); + } return $ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.13/src/UsersRoutines.pm new/yast2-users-2.17.15/src/UsersRoutines.pm --- old/yast2-users-2.17.13/src/UsersRoutines.pm 2008-09-01 10:15:35.000000000 +0200 +++ new/yast2-users-2.17.15/src/UsersRoutines.pm 2008-10-06 13:52:44.000000000 +0200 @@ -32,7 +32,7 @@ # 'volume' information from pam_mount (info about crypted homes) my $pam_mount = undef; -# could we use pam_mount? currntly not if thinkfinger is in use (bnc#390810) +# could we use pam_mount? currntly not if fingerprint dev is in use (bnc#390810) my $crypted_homes_enabled = undef; ##------------------------------------------------------------------------- @@ -562,7 +562,7 @@ sub CryptedHomesEnabled { if (!defined $crypted_homes_enabled) { - $crypted_homes_enabled = !Pam->Enabled ("thinkfinger"); + $crypted_homes_enabled = !Pam->Enabled ("fp"); } return $crypted_homes_enabled; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.13/src/UsersSimple.pm new/yast2-users-2.17.15/src/UsersSimple.pm --- old/yast2-users-2.17.13/src/UsersSimple.pm 2008-09-18 11:30:41.000000000 +0200 +++ new/yast2-users-2.17.15/src/UsersSimple.pm 2008-10-06 13:01:12.000000000 +0200 @@ -114,6 +114,7 @@ YaST::YCP::Import ("InstExtensionImage"); YaST::YCP::Import ("ProductControl"); YaST::YCP::Import ("SCR"); +YaST::YCP::Import ("Stage"); YaST::YCP::Import ("SystemFilesCopy"); YaST::YCP::Import ("UsersUI"); @@ -1209,8 +1210,8 @@ return $network_methods_checked if $network_methods_checked; if (Stage->initial () && !InstExtensionImage->LoadExtension ("bind.rpm", - # busy popup message - sformat (__("Downloading %1 extension..."), "bind.rpm"))) + # busy popup message, %1 is package name + sformat (__("Retrieving %1 extension..."), "bind.rpm"))) { y2error ("loading bind.rpm failed, check for network methods skipped"); return 0; @@ -1291,7 +1292,7 @@ if (Stage->initial ()) { InstExtensionImage->UnLoadExtension ("bind.rpm", - # busy popup message + # busy popup message, %1 is package name sformat (__("Releasing %1 extension..."), "bind.rpm")); } @@ -1305,7 +1306,7 @@ return InstExtensionImage->LoadExtension ("cracklib-dict-full.rpm", # busy popup message - sformat (__("Downloading %1 extension..."), "cracklib-dict-full.rpm")); + sformat (__("Retrieving %1 extension..."), "cracklib-dict-full.rpm")); } ##------------------------------------ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.13/src/widgets.ycp new/yast2-users-2.17.15/src/widgets.ycp --- old/yast2-users-2.17.13/src/widgets.ycp 2008-07-21 16:08:42.000000000 +0200 +++ new/yast2-users-2.17.15/src/widgets.ycp 2008-10-03 12:31:47.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Widgets definitions and helper functions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: widgets.ycp 49295 2008-07-21 14:10:36Z jsuchome $ + * $Id: widgets.ycp 51827 2008-10-03 10:33:02Z jsuchome $ */ { @@ -996,18 +996,18 @@ define list GetExpertList () ``{ list expert_list = []; + if (Autologin::available) + { + expert_list = add (expert_list, + // menubutton label + `item(`id(`autologinconf), _("&Login Settings"))); + } if (!Mode::config ()) { - expert_list = merge (expert_list, [ + expert_list = prepend (expert_list, // menubutton label - `item(`id(`enc), _("Password &Encryption")), - ]); - if (Autologin::available) - { - expert_list = add (expert_list, - // menubutton label - `item(`id(`autologinconf), _("&Login Settings"))); - } + `item (`id(`enc), _("Password &Encryption")) + ); if (!Stage::cont ()) { expert_list = add (expert_list, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.13/VERSION new/yast2-users-2.17.15/VERSION --- old/yast2-users-2.17.13/VERSION 2008-09-19 14:29:10.000000000 +0200 +++ new/yast2-users-2.17.15/VERSION 2008-10-06 13:02:35.000000000 +0200 @@ -1 +1 @@ -2.17.13 +2.17.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package rpm checked in at Mon Oct 6 16:13:12 CEST 2008. -------- --- rpm/rpm.changes 2008-09-16 01:02:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2008-10-02 20:09:22.046699000 +0200 @@ -1,0 +2,16 @@ +Thu Oct 2 18:30:41 CEST 2008 - vuntz(a)suse.de + +- support the new -t option of suse_update_desktop_file.sh in + rpm-suse_macros + +------------------------------------------------------------------- +Thu Oct 2 17:43:59 CEST 2008 - mls(a)suse.de + +- fix rpmrc compile options for ia64 [bnc#431345] + +------------------------------------------------------------------- +Thu Oct 2 16:19:03 CEST 2008 - jblunck(a)suse.de + +- debugedit: Fix some compilation warnings and the canonicalization error. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- elfutils-0.97.diff elfutils-0.97.tar.bz2 New: ---- debugedit-canon-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.ek6185/_old 2008-10-06 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.ek6185/_new 2008-10-06 16:11:55.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2.3 -Release: 5 +Release: 6 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.ek6185/_old 2008-10-06 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.ek6185/_new 2008-10-06 16:11:55.000000000 +0200 @@ -20,14 +20,14 @@ Name: rpm License: GPL v2 or later Group: System/Packages -BuildRequires: libbz2-devel libselinux-devel lzma-alpha-devel ncurses-devel zlib-devel +BuildRequires: libbz2-devel libelf-devel libselinux-devel lzma-alpha-devel ncurses-devel zlib-devel Provides: rpminst %define popt_version 1.7 PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2.3 -Release: 5 +Release: 6 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -36,11 +36,9 @@ Source6: symset-table Source8: rpmconfigcheck Source9: sysconfig.services-rpm -Source10: elfutils-0.97.tar.bz2 -Source11: beecrypt-4.1.2.tar.bz2 -Patch1: elfutils-0.97.diff -Patch2: beecrypt-4.1.2.diff -Patch3: db.diff +Source10: beecrypt-4.1.2.tar.bz2 +Patch1: beecrypt-4.1.2.diff +Patch2: db.diff # quilt patches start here Patch10: debugedit.diff Patch11: findfplistexclude.diff @@ -93,6 +91,7 @@ Patch58: remove-brp-strips.diff Patch59: requires-ge-macro.diff Patch60: mimetype.diff +Patch61: debugedit-canon-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -138,14 +137,8 @@ %prep %setup -q -n rpm-%{version} rm -rf sqlite -rm -rf elfutils rm -rf beecrypt tar xjf %{SOURCE10} -ln -s elfutils-0.97 elfutils -# remove all OSL stuff -rm -rf elfutils/doc elfutils/libebl elfutils/libdw elfutils/libcpu elfutils/libasm elfutils/src elfutils/po elfutils/tests -rm -rf elfutils/lib/dynamicsizehash.c elfutils/lib/dynamicsizehash.h elfutils/lib/list.h elfutils/lib/xmalloc.c elfutils/lib/xstrdup.c elfutils/lib/xstrndup.c -tar xjf %{SOURCE11} ln -s beecrypt-4.1.2 beecrypt #tar xjf %{SOURCE12} #ln -s neon-0.24.7 neon @@ -155,13 +148,13 @@ # %setup -q -D -T -a 9 # mv popt popt.orig # ln -s popt-%{popt_version} popt -%patch -P 1 -P 2 -P 3 +%patch -P 1 -P 2 %patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 20 -P 21 -P 22 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 %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 +%patch -P 60 -P 61 chmod 755 scripts/find-supplements{,.ksyms} chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms tar -xjvf %{SOURCE1} @@ -182,8 +175,6 @@ rm -rf zlib cp /usr/share/gettext/config.rpath . cp popt/autogen.sh beecrypt -cp popt/autogen.sh libelf -cp popt/autogen.sh elfutils cp popt/autogen.sh file # cp popt/autogen.sh neon ./autogen.sh --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --libdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-lua --with-selinux --enable-shared @@ -209,7 +200,7 @@ mv $RPM_BUILD_ROOT/usr/src/* $RPM_BUILD_ROOT/usr/src/packages mkdir -p $RPM_BUILD_ROOT/var/lib/rpm mkdir -p $RPM_BUILD_ROOT/var/spool/repackage -rm -rf $RPM_BUILD_ROOT/usr/include/beecrypt $RPM_BUILD_ROOT/usr/include/libelf $RPM_BUILD_ROOT/%{_libdir}/libbeecrypt* $RPM_BUILD_ROOT/usr/lib/libelf* +rm -rf $RPM_BUILD_ROOT/usr/include/beecrypt $RPM_BUILD_ROOT/%{_libdir}/libbeecrypt* gzip -9 $RPM_BUILD_ROOT/%{_mandir}/man[18]/*.[18] export RPM_BUILD_ROOT %ifarch s390x @@ -306,7 +297,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 453 +Release: 454 # %description -n popt @@ -329,7 +320,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 453 +Release: 454 Requires: popt = 1.7 Requires: glibc-devel @@ -364,6 +355,13 @@ %doc %{_mandir}/man3/popt.3* %changelog +* Thu Oct 02 2008 vuntz(a)suse.de +- support the new -t option of suse_update_desktop_file.sh in + rpm-suse_macros +* Thu Oct 02 2008 mls(a)suse.de +- fix rpmrc compile options for ia64 [bnc#431345] +* Thu Oct 02 2008 jblunck(a)suse.de +- debugedit: Fix some compilation warnings and the canonicalization error. * Tue Sep 16 2008 ro(a)suse.de - fix find-debuginfo.sh and debugsource-package.diff to even apply (directory depth) ++++++ build.diff ++++++ --- /var/tmp/diff_new_pack.ek6185/_old 2008-10-06 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.ek6185/_new 2008-10-06 16:11:55.000000000 +0200 @@ -1,6 +1,20 @@ 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: autogen.sh =================================================================== --- autogen.sh.orig @@ -66,184 +80,6 @@ usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpmbuild.la -Index: db3/configure -=================================================================== ---- db3/configure.orig -+++ db3/configure -@@ -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 \ -+ --with-uniquename=_rpmdb --srcdir=$db_dist $ARGS - - mv Makefile Makefile.orig - cat Makefile.orig | sed -e '/^install[:-]/c\ -Index: file/src/Makefile.am -=================================================================== ---- file/src/Makefile.am.orig -+++ file/src/Makefile.am -@@ -26,7 +26,7 @@ libmagic_la_LDFLAGS = -version-info 1:0: - - noinst_PROGRAMS = file - file_SOURCES = file.c --file_LDFLAGS = -L../../zlib # -all-static -+file_LDFLAGS = # -L../../zlib # -all-static - file_LDADD = libmagic.la - - listobjs: -Index: installplatform -=================================================================== ---- installplatform.orig -+++ installplatform -@@ -68,11 +68,11 @@ for SUBST in $SUBSTS ; do - sparc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-sparc64-linux; LIB=lib64; MULTILIBNO=2 ;; - sparc64v-linux) ARCH_INSTALL_PORT=${pkglibdir}/brp-sparc64-linux; LIB=lib64; MULTILIBNO=2 ;; - s390-linux) MULTILIBNO=1 ;; -- s390x-linux) LIB=lib64; MULTILIBNO=2 ;; -+ s390x-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux; LIB=lib64; MULTILIBNO=2 ;; - ppc-linux) MULTILIBNO=1 ;; -- ppc64-linux) LIB=lib64; MULTILIBNO=2 ;; -+ ppc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux; LIB=lib64; MULTILIBNO=2 ;; - i?86-linux|pentium?-linux|athlon-linux|geode-linux) MULTILIBNO=1 ;; -- x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64; MULTILIBNO=2 ;; -+ x86_64-linux|amd64-linux|ia32e-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux; LIB=lib64; MULTILIBNO=2 ;; - esac - - if [ -n "$MULTILIBNO" ]; then -@@ -102,6 +102,9 @@ for SUBST in $SUBSTS ; do - apple) - VENDORSED='-e s,^@apple@,,' - ;; -+ suse) -+ VENDORSED='-e s,^@SuSE@,,' -+ ;; - esac - - CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`" -Index: lib/Makefile.am -=================================================================== ---- lib/Makefile.am.orig -+++ lib/Makefile.am -@@ -29,7 +29,7 @@ noinst_HEADERS = \ - mylibs = librpm.la - LIBS = - --LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) -+LDFLAGS = - - usrlibdir = $(libdir)@MARK64@ - usrlib_LTLIBRARIES = librpm.la -Index: popt/autogen.sh -=================================================================== ---- popt/autogen.sh.orig -+++ popt/autogen.sh -@@ -28,7 +28,7 @@ fi - - cd "$THEDIR" - --if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then -+if [ X"$*" = X -a "X`uname -s`" = "XLinux" ]; then - $srcdir/configure --prefix=/usr "$@" - else - $srcdir/configure "$@" -Index: rpmdb/Makefile.am -=================================================================== ---- rpmdb/Makefile.am.orig -+++ rpmdb/Makefile.am -@@ -31,7 +31,7 @@ noinst_HEADERS = fprint.h header_interna - pkgbindir = @RPMCONFIGDIR@ - pkgbin_PROGRAMS = \ - rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump rpmdb_load \ -- rpmdb_printlog rpmdb_recover rpmdb_svc rpmdb_stat rpmdb_upgrade \ -+ rpmdb_printlog rpmdb_recover rpmdb_stat rpmdb_upgrade \ - rpmdb_verify - - mylibs = librpmdb.la -@@ -42,7 +42,7 @@ LIBS = - libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la - - # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different --LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) -+LDFLAGS = - - usrlibdir = $(libdir)@MARK64@ - usrlib_LTLIBRARIES = librpmdb.la -Index: rpmio/Makefile.am -=================================================================== ---- rpmio/Makefile.am.orig -+++ rpmio/Makefile.am -@@ -24,9 +24,9 @@ pkginc_HEADERS = \ - rpmsq.h rpmsw.h ugid.h - noinst_HEADERS = rpmio_internal.h rpmlua.h rpmhook.h - --BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs) -+BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/listobjs) - --LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) -+LDFLAGS = - - usrlibdir = $(libdir)@MARK64@ - usrlib_LTLIBRARIES = librpmio.la -@@ -41,14 +41,14 @@ librpmio_la_LDFLAGS = -release 4.4 $(LDF - @WITH_MAGIC_LIB@ \ - @WITH_ZLIB_LIB@ \ - -lpthread --librpmio_la_LIBADD = # $(BEECRYPTLOBJS) --librpmio_la_DEPENDENCIES = # .created -+librpmio_la_LIBADD = $(BEECRYPTLOBJS) -+librpmio_la_DEPENDENCIES = .created - - .created: - if test X"@WITH_BEECRYPT_SUBDIR@" != X; then \ - ${MAKE} -C $(top_builddir)/@WITH_BEECRYPT_SUBDIR@ listobjs ; \ - for lo in $(BEECRYPTLOBJS); do \ -- [ -f $$lo ] || $(LN_S) $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/$$lo $$lo ; \ -+ [ -f $$lo ] || sed -e "s!'!'$(top_builddir)/beecrypt/!" < $(top_builddir)/beecrypt/$$lo > $$lo ; \ - done \ - fi - touch $@ -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig -+++ scripts/Makefile.am -@@ -9,6 +9,7 @@ EXTRA_DIST = \ - brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \ - brp-strip brp-strip-comment-note \ - brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ -+ brp-lib64-linux brp-symlink \ - check-files check-prereqs convertrpmrc.sh cross-build \ - check-buildroot check-rpaths check-rpaths-worker \ - find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ -@@ -21,7 +22,8 @@ EXTRA_DIST = \ - sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ - vpkg-provides.sh vpkg-provides2.sh \ - macros.perl* macros.python* \ -- macros.php* find-*.php find-php-* mono-find* osgideps.pl -+ macros.php* find-*.php find-php-* mono-find* osgideps.pl \ -+ find-provides.ksyms find-requires.ksyms - - installprefix = $(DESTDIR) - -@@ -32,6 +34,7 @@ config_SCRIPTS = \ - brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \ - brp-strip brp-strip-comment-note \ - brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ -+ brp-lib64-linux brp-symlink \ - check-files check-prereqs convertrpmrc.sh cross-build \ - check-buildroot check-rpaths check-rpaths-worker \ - find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ -@@ -42,4 +45,5 @@ config_SCRIPTS = \ - rpmdb_loadcvt rpmdiff rpmdiff.cgi \ - rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ - sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ -- vpkg-provides.sh vpkg-provides2.sh -+ vpkg-provides.sh vpkg-provides2.sh \ -+ find-provides.ksyms find-requires.ksyms Index: configure.ac =================================================================== --- configure.ac.orig @@ -261,6 +97,18 @@ for dir in $dirs do case $dir in +@@ -430,9 +430,9 @@ WITH_LIBELF_LIB= + AC_CHECK_HEADER([libelf.h]) + AC_CHECK_HEADER([gelf.h], [ + AC_DEFINE(HAVE_GELF_H, 1, [Define to 1 if you have the <gelf.h> header file.]) +- AC_CHECK_LIB(elf, gelf_getvernaux, [ ++ AC_CHECK_LIB(elf_pic, gelf_getvernaux, [ + AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).]) +- WITH_LIBELF_LIB="-lelf" ++ WITH_LIBELF_LIB="-lelf_pic" + ]) + ], [ + if test -d elfutils/libelf ; then @@ -440,7 +440,7 @@ AC_CHECK_HEADER([gelf.h], [ AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).]) WITH_ELFUTILS_SUBDIR=elfutils @@ -462,3 +310,181 @@ RPMCANONOS="$build_os_noversion" RPMCANONGNU="$build_os_gnu" AC_SUBST(RPMCANONCOLOR) +Index: db3/configure +=================================================================== +--- db3/configure.orig ++++ db3/configure +@@ -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 \ ++ --with-uniquename=_rpmdb --srcdir=$db_dist $ARGS + + mv Makefile Makefile.orig + cat Makefile.orig | sed -e '/^install[:-]/c\ +Index: file/src/Makefile.am +=================================================================== +--- file/src/Makefile.am.orig ++++ file/src/Makefile.am +@@ -26,7 +26,7 @@ libmagic_la_LDFLAGS = -version-info 1:0: + + noinst_PROGRAMS = file + file_SOURCES = file.c +-file_LDFLAGS = -L../../zlib # -all-static ++file_LDFLAGS = # -L../../zlib # -all-static + file_LDADD = libmagic.la + + listobjs: +Index: installplatform +=================================================================== +--- installplatform.orig ++++ installplatform +@@ -68,11 +68,11 @@ for SUBST in $SUBSTS ; do + sparc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-sparc64-linux; LIB=lib64; MULTILIBNO=2 ;; + sparc64v-linux) ARCH_INSTALL_PORT=${pkglibdir}/brp-sparc64-linux; LIB=lib64; MULTILIBNO=2 ;; + s390-linux) MULTILIBNO=1 ;; +- s390x-linux) LIB=lib64; MULTILIBNO=2 ;; ++ s390x-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux; LIB=lib64; MULTILIBNO=2 ;; + ppc-linux) MULTILIBNO=1 ;; +- ppc64-linux) LIB=lib64; MULTILIBNO=2 ;; ++ ppc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux; LIB=lib64; MULTILIBNO=2 ;; + i?86-linux|pentium?-linux|athlon-linux|geode-linux) MULTILIBNO=1 ;; +- x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64; MULTILIBNO=2 ;; ++ x86_64-linux|amd64-linux|ia32e-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux; LIB=lib64; MULTILIBNO=2 ;; + esac + + if [ -n "$MULTILIBNO" ]; then +@@ -102,6 +102,9 @@ for SUBST in $SUBSTS ; do + apple) + VENDORSED='-e s,^@apple@,,' + ;; ++ suse) ++ VENDORSED='-e s,^@SuSE@,,' ++ ;; + esac + + CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`" +Index: lib/Makefile.am +=================================================================== +--- lib/Makefile.am.orig ++++ lib/Makefile.am +@@ -29,7 +29,7 @@ noinst_HEADERS = \ + mylibs = librpm.la + LIBS = + +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) ++LDFLAGS = + + usrlibdir = $(libdir)@MARK64@ + usrlib_LTLIBRARIES = librpm.la +Index: popt/autogen.sh +=================================================================== +--- popt/autogen.sh.orig ++++ popt/autogen.sh +@@ -28,7 +28,7 @@ fi + + cd "$THEDIR" + +-if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then ++if [ X"$*" = X -a "X`uname -s`" = "XLinux" ]; then + $srcdir/configure --prefix=/usr "$@" + else + $srcdir/configure "$@" +Index: rpmdb/Makefile.am +=================================================================== +--- rpmdb/Makefile.am.orig ++++ rpmdb/Makefile.am +@@ -31,7 +31,7 @@ noinst_HEADERS = fprint.h header_interna + pkgbindir = @RPMCONFIGDIR@ + pkgbin_PROGRAMS = \ + rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump rpmdb_load \ +- rpmdb_printlog rpmdb_recover rpmdb_svc rpmdb_stat rpmdb_upgrade \ ++ rpmdb_printlog rpmdb_recover rpmdb_stat rpmdb_upgrade \ + rpmdb_verify + + mylibs = librpmdb.la +@@ -42,7 +42,7 @@ LIBS = + libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la + + # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) ++LDFLAGS = + + usrlibdir = $(libdir)@MARK64@ + usrlib_LTLIBRARIES = librpmdb.la +Index: rpmio/Makefile.am +=================================================================== +--- rpmio/Makefile.am.orig ++++ rpmio/Makefile.am +@@ -24,9 +24,9 @@ pkginc_HEADERS = \ + rpmsq.h rpmsw.h ugid.h + noinst_HEADERS = rpmio_internal.h rpmlua.h rpmhook.h + +-BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs) ++BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/listobjs) + +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) ++LDFLAGS = + + usrlibdir = $(libdir)@MARK64@ + usrlib_LTLIBRARIES = librpmio.la +@@ -41,14 +41,14 @@ librpmio_la_LDFLAGS = -release 4.4 $(LDF + @WITH_MAGIC_LIB@ \ + @WITH_ZLIB_LIB@ \ + -lpthread +-librpmio_la_LIBADD = # $(BEECRYPTLOBJS) +-librpmio_la_DEPENDENCIES = # .created ++librpmio_la_LIBADD = $(BEECRYPTLOBJS) ++librpmio_la_DEPENDENCIES = .created + + .created: + if test X"@WITH_BEECRYPT_SUBDIR@" != X; then \ + ${MAKE} -C $(top_builddir)/@WITH_BEECRYPT_SUBDIR@ listobjs ; \ + for lo in $(BEECRYPTLOBJS); do \ +- [ -f $$lo ] || $(LN_S) $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/$$lo $$lo ; \ ++ [ -f $$lo ] || sed -e "s!'!'$(top_builddir)/beecrypt/!" < $(top_builddir)/beecrypt/$$lo > $$lo ; \ + done \ + fi + touch $@ +Index: scripts/Makefile.am +=================================================================== +--- scripts/Makefile.am.orig ++++ scripts/Makefile.am +@@ -9,6 +9,7 @@ EXTRA_DIST = \ + brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \ + brp-strip brp-strip-comment-note \ + brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ ++ brp-lib64-linux brp-symlink \ + check-files check-prereqs convertrpmrc.sh cross-build \ + check-buildroot check-rpaths check-rpaths-worker \ + find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ +@@ -21,7 +22,8 @@ EXTRA_DIST = \ + sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ + vpkg-provides.sh vpkg-provides2.sh \ + macros.perl* macros.python* \ +- macros.php* find-*.php find-php-* mono-find* osgideps.pl ++ macros.php* find-*.php find-php-* mono-find* osgideps.pl \ ++ find-provides.ksyms find-requires.ksyms + + installprefix = $(DESTDIR) + +@@ -32,6 +34,7 @@ config_SCRIPTS = \ + brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \ + brp-strip brp-strip-comment-note \ + brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ ++ brp-lib64-linux brp-symlink \ + check-files check-prereqs convertrpmrc.sh cross-build \ + check-buildroot check-rpaths check-rpaths-worker \ + find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ +@@ -42,4 +45,5 @@ config_SCRIPTS = \ + rpmdb_loadcvt rpmdiff rpmdiff.cgi \ + rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ + sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ +- vpkg-provides.sh vpkg-provides2.sh ++ vpkg-provides.sh vpkg-provides2.sh \ ++ find-provides.ksyms find-requires.ksyms ++++++ debugedit-canon-fix.diff ++++++ --- tools/debugedit.c | 137 +++++++++++++++++++++++++++--------------------------- 1 file changed, 70 insertions(+), 67 deletions(-) Index: b/tools/debugedit.c =================================================================== --- tools/debugedit.c +++ tools/debugedit.c @@ -471,13 +471,13 @@ has_prefix (const char *str, { int str_len; int prefix_len; - + str_len = strlen (str); prefix_len = strlen (prefix); if (str_len < prefix_len) return 0; - + return strncmp (str, prefix, prefix_len) == 0; } @@ -485,7 +485,7 @@ static int edit_dwarf2_line (DSO *dso, uint_32 off, char *comp_dir, int phase) { unsigned char *ptr = debug_sections[DEBUG_LINE].data, *dir; - unsigned char **dirt; + char **dirt; unsigned char *endsec = ptr + debug_sections[DEBUG_LINE].size; unsigned char *endcu, *endprol; unsigned char opcode_base; @@ -496,9 +496,9 @@ edit_dwarf2_line (DSO *dso, uint_32 off, if (phase != 0) return 0; - + ptr += off; - + endcu = ptr + 4; endcu += read_32 (ptr); if (endcu == ptr + 0xffffffff) @@ -521,7 +521,7 @@ edit_dwarf2_line (DSO *dso, uint_32 off, value); return 1; } - + endprol = ptr + 4; endprol += read_32 (ptr); if (endprol > endcu) @@ -530,26 +530,26 @@ edit_dwarf2_line (DSO *dso, uint_32 off, dso->filename); return 1; } - + opcode_base = ptr[4]; ptr = dir = ptr + 4 + opcode_base; - + /* dir table: */ value = 1; while (*ptr != 0) { - ptr = strchr (ptr, 0) + 1; + ptr = (unsigned char *)strchr ((char *)ptr, 0) + 1; ++value; } - dirt = (unsigned char **) alloca (value * sizeof (unsigned char *)); + dirt = (char **) alloca (value * sizeof (char *)); dirt[0] = "."; dirt_cnt = 1; ptr = dir; while (*ptr != 0) { - dirt[dirt_cnt++] = ptr; - ptr = strchr (ptr, 0) + 1; + dirt[dirt_cnt++] = (char *)ptr; + ptr = (unsigned char *)strchr ((char *)ptr, 0) + 1; } ptr++; @@ -559,8 +559,8 @@ edit_dwarf2_line (DSO *dso, uint_32 off, char *s, *file; size_t file_len, dir_len; - file = ptr; - ptr = strchr (ptr, 0) + 1; + file = (char *)ptr; + ptr = (unsigned char *)strchr ((char *)ptr, 0) + 1; value = read_uleb128 (ptr); if (value >= dirt_cnt) @@ -629,7 +629,7 @@ edit_dwarf2_line (DSO *dso, uint_32 off, } free (s); - + read_uleb128 (ptr); read_uleb128 (ptr); } @@ -661,7 +661,7 @@ edit_dwarf2_line (DSO *dso, uint_32 off, if (dest_dir) { - unsigned char *srcptr, *buf = NULL; + char *srcptr, *srcstart, *buf = NULL; size_t base_len = strlen (base_dir); size_t dest_len = strlen (dest_dir); size_t shrank = 0; @@ -675,12 +675,16 @@ edit_dwarf2_line (DSO *dso, uint_32 off, ptr = dir; } else - ptr = srcptr = dir; - unsigned char *srcstart=srcptr; + { + ptr = dir; + srcptr = (char *)dir; + } + + srcstart = srcptr; while (*srcptr != 0) { - size_t len = strlen (srcptr) + 1; - const unsigned char *readptr = srcptr; + size_t len = strlen (srcptr); + const char *readptr = srcptr; if (*srcptr == '/' && has_prefix (srcptr, base_dir)) { @@ -689,24 +693,28 @@ edit_dwarf2_line (DSO *dso, uint_32 off, memcpy (ptr, dest_dir, dest_len); ptr += dest_len; readptr += base_len; - } + } srcptr += len; shrank += srcptr - readptr; - canonicalize_path (readptr, ptr); - len = strlen (ptr) + 1; + canonicalize_path (readptr, (char *)ptr); + len = strlen ((char *)ptr); + + if ((srcptr - readptr) > len) + error(0, 0,"canonicalization unexpectedly shrank (%lu): \"%s\"\n", + (long unsigned int)(srcptr - readptr) - len, ptr); + shrank -= len; ptr += len; - elf_flagdata (debug_sections[DEBUG_STR].elf_data, - ELF_C_SET, ELF_F_DIRTY); - } + elf_flagdata (debug_sections[DEBUG_STR].elf_data, + ELF_C_SET, ELF_F_DIRTY); + ++ptr; + ++srcptr; + } if (shrank > 0) { - if (--shrank == 0) - error (EXIT_FAILURE, 0, - "canonicalization unexpectedly shrank by one character"); memset (ptr, 'X', shrank); ptr += shrank; *ptr++ = '\0'; @@ -741,17 +749,17 @@ edit_dwarf2_line (DSO *dso, uint_32 off, elf_flagdata (debug_sections[DEBUG_STR].elf_data, ELF_C_SET, ELF_F_DIRTY); } - else if (ptr != srcptr) + else if ((char *)ptr != srcptr) memmove (ptr, srcptr, len); srcptr += len; ptr += len; - dir = srcptr; + dir = (unsigned char *)srcptr; read_uleb128 (srcptr); read_uleb128 (srcptr); read_uleb128 (srcptr); if (ptr != dir) - memmove (ptr, dir, srcptr - dir); - ptr += srcptr - dir; + memmove (ptr, dir, (unsigned char *)srcptr - dir); + ptr += (unsigned char *)srcptr - dir; } *ptr = '\0'; free (buf); @@ -767,17 +775,13 @@ edit_attributes (DSO *dso, unsigned char int i; uint_32 list_offs; int found_list_offs; - unsigned char *comp_dir; - - comp_dir = NULL; - list_offs = 0; - found_list_offs = 0; + char *comp_dir; + for (i = 0; i < t->nattr; ++i) { uint_32 form = t->attr[i].form; uint_32 len = 0; int base_len, dest_len; - while (1) { @@ -791,56 +795,55 @@ edit_attributes (DSO *dso, unsigned char } if (t->attr[i].attr == DW_AT_comp_dir) - { + { if ( form == DW_FORM_string ) - { + { free (comp_dir); - comp_dir = strdup (ptr); - - if (phase == 1 && dest_dir && has_prefix (ptr, base_dir)) - { + comp_dir = strdup ((char *)ptr); + + if (phase == 1 && dest_dir + && has_prefix ((char *)ptr, base_dir)) + { base_len = strlen (base_dir); dest_len = strlen (dest_dir); - + memcpy (ptr, dest_dir, dest_len); if (dest_len < base_len) - { + { memset(ptr + dest_len, '/', base_len - dest_len); - - } + } elf_flagdata (debug_sections[DEBUG_INFO].elf_data, ELF_C_SET, ELF_F_DIRTY); - } - } - + } + } else if (form == DW_FORM_strp && debug_sections[DEBUG_STR].data) - { + { char *dir; - dir = debug_sections[DEBUG_STR].data - + do_read_32_relocated (ptr); + dir = (char *)debug_sections[DEBUG_STR].data + + do_read_32_relocated (ptr); free (comp_dir); comp_dir = strdup (dir); if (phase == 1 && dest_dir && has_prefix (dir, base_dir)) - { + { base_len = strlen (base_dir); dest_len = strlen (dest_dir); - + memcpy (dir, dest_dir, dest_len); if (dest_len < base_len) - { + { memmove (dir + dest_len, dir + base_len, strlen (dir + base_len) + 1); - } + } elf_flagdata (debug_sections[DEBUG_STR].elf_data, ELF_C_SET, ELF_F_DIRTY); - } - } - } + } + } + } else if ((t->tag == DW_TAG_compile_unit || t->tag == DW_TAG_partial_unit) && t->attr[i].attr == DW_AT_name @@ -848,9 +851,9 @@ edit_attributes (DSO *dso, unsigned char && debug_sections[DEBUG_STR].data) { char *name; - - name = debug_sections[DEBUG_STR].data - + do_read_32_relocated (ptr); + + name = (char *)debug_sections[DEBUG_STR].data + + do_read_32_relocated (ptr); if (*name == '/' && comp_dir == NULL) { char *enddir = strrchr (name, '/'); @@ -869,7 +872,7 @@ edit_attributes (DSO *dso, unsigned char { base_len = strlen (base_dir); dest_len = strlen (dest_dir); - + memcpy (name, dest_dir, dest_len); if (dest_len < base_len) { @@ -913,7 +916,7 @@ edit_attributes (DSO *dso, unsigned char ptr += 4; break; case DW_FORM_string: - ptr = strchr (ptr, '\0') + 1; + ptr = (unsigned char *)strchr ((char *)ptr, '\0') + 1; break; case DW_FORM_indirect: form = read_uleb128 (ptr); ++++++ finddebuginfo.diff ++++++ --- /var/tmp/diff_new_pack.ek6185/_old 2008-10-06 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.ek6185/_new 2008-10-06 16:11:55.000000000 +0200 @@ -1,6 +1,12 @@ ---- scripts/find-debuginfo.sh 2008/09/15 22:56:11 1.1 -+++ scripts/find-debuginfo.sh 2008/09/15 22:58:57 -@@ -126,6 +126,20 @@ +--- + scripts/find-debuginfo.sh | 69 +++++++++++++++++++++++++++++++++++----------- + 1 file changed, 53 insertions(+), 16 deletions(-) + +Index: scripts/find-debuginfo.sh +=================================================================== +--- scripts/find-debuginfo.sh.orig ++++ scripts/find-debuginfo.sh +@@ -126,6 +126,20 @@ debug_link() link_relative "$t" "$l" "$RPM_BUILD_ROOT" } @@ -21,7 +27,7 @@ # Make a build-id symlink for id $1 with suffix $3 to file $2. make_id_link() { -@@ -144,7 +158,7 @@ +@@ -144,7 +158,7 @@ make_id_link() local other=$(readlink -m "$root_idfile") other=${other#$RPM_BUILD_ROOT} if cmp -s "$root_idfile" "$RPM_BUILD_ROOT$file" || @@ -30,7 +36,7 @@ # Two copies. Maybe one has to be setuid or something. echo >&2 "*** WARNING: identical binaries are copied, not linked:" echo >&2 " $file" -@@ -173,12 +187,18 @@ +@@ -173,12 +187,18 @@ strict_error=ERROR $strict || strict_error=WARNING # Strip ELF binaries @@ -54,16 +60,21 @@ get_debugfn "$f" [ -f "${debugfn}" ] && continue -@@ -199,6 +219,8 @@ +@@ -199,8 +219,11 @@ while read nlinks inum f; do fi echo "extracting debug info from $f" +- id=$(/usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug \ +- -i -l "$SOURCEFILE" "$f") || exit + mode=$(stat -c %a "$f") + chmod +w "$f" - id=$(/usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug \ - -i -l "$SOURCEFILE" "$f") || exit ++ id=$($(DEBUGEDIT=$(which debugedit 2>/dev/null); \ ++ echo ${DEBUGEDIT:-/usr/lib/rpm/debugedit}) -b "$RPM_BUILD_DIR" \ ++ -d /usr/src/debug -i -l "$SOURCEFILE" "$f") || exit if [ -z "$id" ]; then -@@ -215,13 +237,25 @@ + echo >&2 "*** ${strict_error}: No build ID note found in $f" + $strict && exit 2 +@@ -215,13 +238,25 @@ while read nlinks inum f; do esac mkdir -p "${debugdn}" @@ -96,7 +107,7 @@ if [ -n "$id" ]; then make_id_link "$id" "$dn/$(basename $f)" -@@ -250,12 +284,14 @@ +@@ -250,12 +285,14 @@ if [ -s "$SOURCEFILE" ]; then # stupid cpio creates new directories in mode 0700, fixup find "${RPM_BUILD_ROOT}/usr/src/debug" -type d -print0 | xargs --no-run-if-empty -0 chmod a+rx ++++++ rpmrc.diff ++++++ --- /var/tmp/diff_new_pack.ek6185/_old 2008-10-06 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.ek6185/_new 2008-10-06 16:11:55.000000000 +0200 @@ -25,7 +25,7 @@ optflags: geode -Os -g -m32 -march=geode -optflags: ia64 -O2 -g -m64 -mtune=generic -optflags: x86_64 -O2 -g -m64 -mtune=generic -+optflags: ia64 -O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 ++optflags: ia64 -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 +optflags: x86_64 -O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 optflags: amd64 -O2 -g -mtune=generic optflags: ia32e -O2 -g -m64 -mtune=generic ++++++ rpm-suse_macros ++++++ --- rpm/rpm-suse_macros 2008-09-12 20:24:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm-suse_macros 2008-10-02 20:09:57.689021000 +0200 @@ -43,7 +43,7 @@ # macro: %suse_update_desktop_file # Used to add easily a category to .desktop files according to XDG # standard. -%suse_update_desktop_file(cinrud:D:N:C:G:) \ +%suse_update_desktop_file(cinrtud:D:N:C:G:) \ /usr/lib/rpm/suse_update_desktop_file.sh %{**} || exit 1 \ %nil ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-tune
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-tune checked in at Mon Oct 6 16:09:58 CEST 2008. -------- --- yast2-tune/yast2-tune.changes 2008-09-10 11:14:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-tune/yast2-tune.changes 2008-10-03 13:07:34.957199000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 3 13:03:03 CEST 2008 - lslezak(a)suse.cz + +- SystemSettings.ycp - check if ENABLE_SYSRQ is nil (bnc#431909) +- 2.17.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-tune-2.17.3.tar.bz2 New: ---- yast2-tune-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tune.spec ++++++ --- /var/tmp/diff_new_pack.zdg755/_old 2008-10-06 16:09:38.000000000 +0200 +++ /var/tmp/diff_new_pack.zdg755/_new 2008-10-06 16:09:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-tune (Version 2.17.3) +# spec file for package yast2-tune (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-tune -Version: 2.17.3 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-tune-2.17.3.tar.bz2 +Source0: yast2-tune-2.17.4.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite # hwinfo/classnames.ycp @@ -42,7 +42,7 @@ %prep -%setup -n yast2-tune-2.17.3 +%setup -n yast2-tune-2.17.4 %build %{prefix}/bin/y2tool y2autoconf @@ -80,8 +80,10 @@ /usr/share/YaST2/modules/*.ybc /usr/share/YaST2/scrconf/*.scr %doc %{prefix}/share/doc/packages/yast2-tune - %changelog +* Fri Oct 03 2008 lslezak(a)suse.cz +- SystemSettings.ycp - check if ENABLE_SYSRQ is nil (bnc#431909) +- 2.17.4 * Wed Sep 10 2008 lslezak(a)suse.cz - merged proofread texts (2008-09-08) - 2.17.3 ++++++ yast2-tune-2.17.3.tar.bz2 -> yast2-tune-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.17.3/configure new/yast2-tune-2.17.4/configure --- old/yast2-tune-2.17.3/configure 2008-09-10 11:12:20.000000000 +0200 +++ new/yast2-tune-2.17.4/configure 2008-10-03 13:06:24.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-tune 2.17.3. +# Generated by GNU Autoconf 2.61 for yast2-tune 2.17.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-tune' PACKAGE_TARNAME='yast2-tune' -PACKAGE_VERSION='2.17.3' -PACKAGE_STRING='yast2-tune 2.17.3' +PACKAGE_VERSION='2.17.4' +PACKAGE_STRING='yast2-tune 2.17.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1199,7 +1199,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-tune 2.17.3 to adapt to many kinds of systems. +\`configure' configures yast2-tune 2.17.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1270,7 +1270,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-tune 2.17.3:";; + short | recursive ) echo "Configuration of yast2-tune 2.17.4:";; esac cat <<\_ACEOF @@ -1348,7 +1348,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-tune configure 2.17.3 +yast2-tune configure 2.17.4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1362,7 +1362,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-tune $as_me 2.17.3, which was +It was created by yast2-tune $as_me 2.17.4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2183,7 +2183,7 @@ # Define the identity of the package. PACKAGE='yast2-tune' - VERSION='2.17.3' + VERSION='2.17.4' cat >>confdefs.h <<_ACEOF @@ -2411,7 +2411,7 @@ -VERSION="2.17.3" +VERSION="2.17.4" RPMNAME="yast2-tune" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3322,7 +3322,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-tune $as_me 2.17.3, which was +This file was extended by yast2-tune $as_me 2.17.4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3365,7 +3365,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-tune config.status 2.17.3 +yast2-tune config.status 2.17.4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.17.3/configure.in new/yast2-tune-2.17.4/configure.in --- old/yast2-tune-2.17.3/configure.in 2008-09-10 11:12:15.000000000 +0200 +++ new/yast2-tune-2.17.4/configure.in 2008-10-03 13:06:18.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-tune, 2.17.3, http://bugs.opensuse.org/, yast2-tune) +AC_INIT(yast2-tune, 2.17.4, http://bugs.opensuse.org/, yast2-tune) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.3" +VERSION="2.17.4" RPMNAME="yast2-tune" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.17.3/hwinfo/src/SystemSettings.ycp new/yast2-tune-2.17.4/hwinfo/src/SystemSettings.ycp --- old/yast2-tune-2.17.3/hwinfo/src/SystemSettings.ycp 2008-06-05 15:04:52.000000000 +0200 +++ new/yast2-tune-2.17.4/hwinfo/src/SystemSettings.ycp 2008-10-03 13:06:10.000000000 +0200 @@ -4,7 +4,7 @@ * * Author: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: SystemSettings.ycp 48100 2008-06-05 13:04:51Z lslezak $ + * $Id: SystemSettings.ycp 51831 2008-10-03 11:06:09Z lslezak $ * * This module manages the System and Kernel settings such as I/O Scheduler type, * Serial Console, SysRq Keys... @@ -139,7 +139,7 @@ global define boolean Write () { // writing SysRq settings - if (ENABLE_SYSRQ == "yes" || ENABLE_SYSRQ == "no" || regexpmatch(ENABLE_SYSRQ, "^[0-9]*$")) + if (ENABLE_SYSRQ != nil && (ENABLE_SYSRQ == "yes" || ENABLE_SYSRQ == "no" || regexpmatch(ENABLE_SYSRQ, "^[0-9]*$"))) { // save the SysRq setting y2milestone("Saving ENABLE_SYSRQ: %1", ENABLE_SYSRQ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.17.3/VERSION new/yast2-tune-2.17.4/VERSION --- old/yast2-tune-2.17.3/VERSION 2008-09-10 11:11:44.000000000 +0200 +++ new/yast2-tune-2.17.4/VERSION 2008-10-03 13:02:47.000000000 +0200 @@ -1 +1 @@ -2.17.3 +2.17.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit skelcd-driverupdate
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package skelcd-driverupdate checked in at Mon Oct 6 16:08:26 CEST 2008. -------- --- skelcd-driverupdate/skelcd-driverupdate.changes 2008-09-30 10:11:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/skelcd-driverupdate/skelcd-driverupdate.changes 2008-10-02 16:16:29.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 2 16:16:20 CEST 2008 - kukuk(a)suse.de + +- Fix building again + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-driverupdate.spec ++++++ --- /var/tmp/diff_new_pack.h29652/_old 2008-10-06 16:07:50.000000000 +0200 +++ /var/tmp/diff_new_pack.h29652/_new 2008-10-06 16:07:50.000000000 +0200 @@ -31,7 +31,7 @@ Group: Metapackages AutoReqProv: off Version: 2004.5.25 -Release: 123 +Release: 124 Summary: Driverupdate for SLES Service-Packs BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: driverupdate.tar.bz2 @@ -65,6 +65,8 @@ %prep %setup -n driverupdate +%build + %install base_dir=$RPM_BUILD_ROOT/CD1/linux/%{topdir}/%{myarch}-%{distdir} rm -rf $RPM_BUILD_ROOT @@ -94,11 +96,7 @@ fi done < %{S:3} # Copy new YCP files that do not exist in rootmd5 -%if %sles_version > 0 -ii_src=/SuSE/SLES/CD1/boot/${RPM_ARCH}/root -%else -ii_src=/SuSE/SuSE/CD1/boot/${RPM_ARCH}/root -%endif +ii_src=/CD1/boot/${RPM_ARCH}/root ii_mnt=/mnt [ -f $ii_src ] || { echo 'no inst-sys found!' @@ -149,8 +147,6 @@ # More stuff comes here cp /usr/bin/readlink $base_dir/install cp -av /usr/share/YaST2/theme $base_dir/inst-sys/usr/share/YaST2/ - mkdir $base_dir/inst-sys/usr/share/YaST2/theme/current/wallpapers - cp -p %SOURCE2 $base_dir/inst-sys/usr/share/YaST2/theme/current/wallpapers/ echo "UpdateID: `cat \`find $base_dir -type f\` | md5sum | head -c 16`" >>$base_dir/dud.config # Take priority over 'normal' driver updates. This basically enforces our # updates over the ones from 3rd party disks. @@ -165,6 +161,8 @@ /CD1 %changelog +* Thu Oct 02 2008 kukuk(a)suse.de +- Fix building again * Tue Sep 30 2008 kukuk(a)suse.de - yast2-theme-SLED is now yast2-theme-SLE * Thu Aug 14 2008 lrupp(a)suse.de ++++++ newfiles ++++++ --- skelcd-driverupdate/newfiles 2008-08-12 02:21:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/skelcd-driverupdate/newfiles 2008-10-02 16:02:43.000000000 +0200 @@ -49,37 +49,3 @@ /usr/lib*/perl5/vendor_perl/*/*-linux-thread-multi*/auto/ycp /usr/lib*/perl5/vendor_perl/*/*-linux-thread-multi*/auto/ycp/.packlist /usr/lib*/perl5/vendor_perl/*/ycp.pm - -# yast2-storage -/usr/lib*/YaST2/bin/check.boot -/usr/lib*/YaST2/plugin/libpy2StorageCallbacks.so* -/usr/lib*/perl5/vendor_perl/5.8.8/*-linux-thread-multi*/LibStorage.so -/usr/sbin/create_udev_cdrom_rules - -# udev -/lib/udev/ata_id -/lib/udev/cdrom_id -/lib/udev/edd_id -/lib/udev/path_id -/lib/udev/scsi_id -/lib/udev/usb_id -/lib/udev/vol_id -/sbin/udevcontrol -/sbin/udevd -/sbin/udevsettle -/sbin/udevtrigger -/sbin/scsi_id -/usr/bin/udev.count_events -/usr/bin/udevinfo -/usr/bin/udevtest -/usr/sbin/udevmonitor - -# hal -/usr/bin/hal-device -/usr/bin/hal-find-by-capability -/usr/bin/hal-find-by-property -/usr/bin/hal-get-property -/usr/bin/hal-set-property -/usr/bin/lshal -/usr/lib*/hal -/usr/share/hal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-support
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-support checked in at Mon Oct 6 16:08:19 CEST 2008. -------- --- yast2-support/yast2-support.changes 2008-09-29 15:51:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-support/yast2-support.changes 2008-10-02 22:13:04.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Oct 2 21:53:07 CEST 2008 - mzugec(a)suse.de + +- moved module into Support group (bnc#430005) +- 2.17.7 + +------------------------------------------------------------------- +Thu Oct 2 09:44:49 CEST 2008 - mzugec(a)suse.cz + +- changed Novell Support Center URL + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-support-2.17.6.tar.bz2 New: ---- yast2-support-2.17.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-support.spec ++++++ --- /var/tmp/diff_new_pack.a29301/_old 2008-10-06 16:07:42.000000000 +0200 +++ /var/tmp/diff_new_pack.a29301/_new 2008-10-06 16:07:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-support (Version 2.17.6) +# spec file for package yast2-support (Version 2.17.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-support -Version: 2.17.6 +Version: 2.17.7 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-support-2.17.6.tar.bz2 +Source0: yast2-support-2.17.7.tar.bz2 Prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -38,7 +38,7 @@ %prep -%setup -n yast2-support-2.17.6 +%setup -n yast2-support-2.17.7 %build %{prefix}/bin/y2tool y2autoconf @@ -72,6 +72,11 @@ /usr/share/YaST2/scrconf/*.scr %doc %{prefix}/share/doc/packages/yast2-support %changelog +* Thu Oct 02 2008 mzugec(a)suse.de +- moved module into Support group (bnc#430005) +- 2.17.7 +* Thu Oct 02 2008 mzugec(a)suse.cz +- changed Novell Support Center URL * Mon Sep 29 2008 mzugec(a)suse.cz - added support for new identifiers (fate#305243) - 2.17.6 ++++++ yast2-support-2.17.6.tar.bz2 -> yast2-support-2.17.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.6/configure new/yast2-support-2.17.7/configure --- old/yast2-support-2.17.6/configure 2008-09-29 15:36:31.000000000 +0200 +++ new/yast2-support-2.17.7/configure 2008-10-02 21:52:42.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-support 2.17.5. +# Generated by GNU Autoconf 2.61 for yast2-support 2.17.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-support' PACKAGE_TARNAME='yast2-support' -PACKAGE_VERSION='2.17.5' -PACKAGE_STRING='yast2-support 2.17.5' +PACKAGE_VERSION='2.17.6' +PACKAGE_STRING='yast2-support 2.17.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-support 2.17.5 to adapt to many kinds of systems. +\`configure' configures yast2-support 2.17.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-support 2.17.5:";; + short | recursive ) echo "Configuration of yast2-support 2.17.6:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-support configure 2.17.5 +yast2-support configure 2.17.6 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-support $as_me 2.17.5, which was +It was created by yast2-support $as_me 2.17.6, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-support' - VERSION='2.17.5' + VERSION='2.17.6' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.5" +VERSION="2.17.6" RPMNAME="yast2-support" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-support $as_me 2.17.5, which was +This file was extended by yast2-support $as_me 2.17.6, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-support config.status 2.17.5 +yast2-support config.status 2.17.6 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.6/configure.in new/yast2-support-2.17.7/configure.in --- old/yast2-support-2.17.6/configure.in 2008-09-29 15:36:23.000000000 +0200 +++ new/yast2-support-2.17.7/configure.in 2008-10-02 21:52:38.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-support, 2.17.5, http://bugs.opensuse.org/, yast2-support) +AC_INIT(yast2-support, 2.17.6, http://bugs.opensuse.org/, yast2-support) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.5" +VERSION="2.17.6" RPMNAME="yast2-support" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.6/src/dialogs.ycp new/yast2-support-2.17.7/src/dialogs.ycp --- old/yast2-support-2.17.6/src/dialogs.ycp 2008-09-29 15:36:00.000000000 +0200 +++ new/yast2-support-2.17.7/src/dialogs.ycp 2008-10-02 21:27:40.000000000 +0200 @@ -101,7 +101,7 @@ break; else if (ret == `browser){ - string url="www.novell.com"; + string url="http://www.novell.com/center/eservice"; y2milestone("Executing browser %1 with URL %2", Support::browser, url); SCR::Execute(.target.bash, sformat("su $(env|grep LOGNAME|cut -d'=' -f2-) -c \"%1 %2\"", Support::browser, url)); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.6/src/support.desktop new/yast2-support-2.17.7/src/support.desktop --- old/yast2-support-2.17.6/src/support.desktop 2008-09-05 10:16:46.000000000 +0200 +++ new/yast2-support-2.17.7/src/support.desktop 2008-10-02 21:43:12.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;X-SuSE-YaST-Support; X-KDE-ModuleType=Library X-KDE-RootOnly=true @@ -8,7 +8,7 @@ X-KDE-Library=yast2 X-SuSE-YaST-Call=support -X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Group=Support X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true X-SuSE-YaST-AutoInst= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.6/VERSION new/yast2-support-2.17.7/VERSION --- old/yast2-support-2.17.6/VERSION 2008-09-29 15:37:09.000000000 +0200 +++ new/yast2-support-2.17.7/VERSION 2008-10-02 21:53:02.000000000 +0200 @@ -1 +1 @@ -2.17.6 +2.17.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-sound
by root＠Hilbert.suse.de 06 Oct '08

06 Oct '08

Hello community, here is the log from the commit of package yast2-sound checked in at Mon Oct 6 16:07:34 CEST 2008. -------- --- yast2-sound/yast2-sound.changes 2008-09-15 13:53:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-sound/yast2-sound.changes 2008-10-06 15:28:46.273837000 +0200 @@ -1,0 +2,12 @@ +Mon Oct 6 15:10:59 CEST 2008 - lslezak(a)suse.cz + +- the sound card DB has been updated to kernel-2.6.27-rc7-12 + (bnc#432575) +- 2.17.4 + +------------------------------------------------------------------- +Mon Oct 6 13:27:42 CEST 2008 - visnov(a)suse.cz + +- adapt to new Confirm::Detection API (bnc #431276) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-sound.spec ++++++ --- /var/tmp/diff_new_pack.P28355/_old 2008-10-06 16:07:22.000000000 +0200 +++ /var/tmp/diff_new_pack.P28355/_new 2008-10-06 16:07:22.000000000 +0200 @@ -20,7 +20,7 @@ Name: yast2-sound Version: 2.17.3 -Release: 1 +Release: 2 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,6 +94,12 @@ /usr/share/YaST2/scrconf/*.scr %doc %{prefix}/share/doc/packages/yast2-sound %changelog +* Mon Oct 06 2008 lslezak(a)suse.cz +- the sound card DB has been updated to kernel-2.6.27-rc7-12 + (bnc#432575) +- 2.17.4 +* Mon Oct 06 2008 visnov(a)suse.cz +- adapt to new Confirm::Detection API (bnc #431276) * Fri Sep 12 2008 lslezak(a)suse.cz - fixed build - added missing PulseAudio.* files in .spec file - 2.17.3 ++++++ yast2-sound-2.17.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sound-2.17.3/data/sndcards.ycp new/yast2-sound-2.17.3/data/sndcards.ycp --- old/yast2-sound-2.17.3/data/sndcards.ycp 2008-04-14 12:45:53.000000000 +0200 +++ new/yast2-sound-2.17.3/data/sndcards.ycp 2008-10-06 14:53:44.000000000 +0200 @@ -1,4 +1,4 @@ -/* this file is automatically generated for kernel version 2.6.25-rc8-12-pae*/ +/* this file is automatically generated for kernel version 2.6.27-rc7-12-pae*/ { textdomain "sound_db"; @@ -666,13 +666,17 @@ 31001 : 78, 31035 : 78, 38415 : 78, + 38671 : 78, 43520 : 78, 43528 : 78, 43536 : 78, 43544 : 78, 43552 : 78, 43560 : 78, - 43568 : 78 + 43568 : 78, + 43576 : 78, + 43584 : 78, + 43592 : 78 ], 4107 : $[ 46 : 81 @@ -764,7 +768,11 @@ 2752 : 78, 2753 : 78, 2754 : 78, - 2755 : 78 + 2755 : 78, + 3028 : 78, + 3029 : 78, + 3030 : 78, + 3031 : 78 ], 4334 : $[ 16320 : 54, @@ -864,8 +872,8 @@ 8704 : 48 ], 15892 : $[ - 2340 : 49, - 2341 : 49, + 2340 : 50, + 2341 : 50, 2353 : 51 ], 16389 : $[ @@ -893,6 +901,9 @@ 21299 : $[ 51712 : 61 ], + 25929 : $[ + 4608 : 78 + ], 26024 : $[ 32 : 48, 48 : 48, @@ -922,10 +933,12 @@ 10205 : 39, 10206 : 38, 10315 : 78, + 10513 : 78, 10558 : 78, 10559 : 78, 14910 : 78, 14958 : 78, + 15190 : 78, 29077 : 38, 29078 : 39, 33051 : 78 @@ -2384,7 +2397,7 @@ "position_fix" : $[ "allows" : "{{0,auto},{1,none},{2,posbuf},{3,fifo}}", "default" : "0", - "descr" : _("Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size)."), + "descr" : _("Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF)."), "dialog" : "check" ], "single_cmd" : $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sound-2.17.3/sound/src/read_routines.ycp new/yast2-sound-2.17.3/sound/src/read_routines.ycp --- old/yast2-sound-2.17.3/sound/src/read_routines.ycp 2008-04-25 13:13:15.000000000 +0200 +++ new/yast2-sound-2.17.3/sound/src/read_routines.ycp 2008-10-06 15:13:02.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Dan Meszaros <dmeszar(a)suse.cz> * - * $Id: read_routines.ycp 47064 2008-04-25 11:13:14Z lslezak $ + * $Id: read_routines.ycp 51857 2008-10-06 11:28:26Z visnov $ * */ @@ -175,7 +175,7 @@ list<map> det_cards = []; /* Confirmation: label text (detecting hardware: xxx) */ - if (!Confirm::Detection (_("Sound Cards"))) + if (!Confirm::Detection (_("Sound Cards"), "yast-sound")) { det_cards = []; Sound::skip_detection = true; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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