October 2010 - openSUSE Commits - openSUSE Mailing Lists

commit openldap2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at Sat Oct 2 00:00:18 CEST 2010. -------- --- openldap2/openldap2-client.changes 2010-08-27 21:43:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/openldap2/openldap2-client.changes 2010-10-01 23:59:47.766638000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 29 09:21:52 UTC 2010 - rhafer(a)novell.com + +- Don't build 2.3 slapcat anymore for 11.3 and newer. We switch to + 2.4 long ago. +- Removed automatic 2.3->2.4 migration in %post +- moved back-sql examples to make rpmlint happy + +------------------------------------------------------------------- openldap2.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.r2dDe7/_old 2010-10-01 23:59:56.000000000 +0200 +++ /var/tmp/diff_new_pack.r2dDe7/_new 2010-10-01 23:59:56.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif Version: 2.4.23 -Release: 1 +Release: 2 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 %if "%{name}" == "openldap2" @@ -239,6 +239,7 @@ make depend make %{?jobs:-j%jobs} %if "%{name}" == "openldap2" +%if %suse_version < 1130 # build a static slapcat binary from the OpenLDAP 2.3 release # to be able to update existing databases cd ../openldap-2.3.37 @@ -257,6 +258,7 @@ make depend make %{?jobs:-j%jobs} %endif +%endif %check %if %run_test_suite @@ -310,9 +312,12 @@ rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example +mv servers/slapd/back-sql/rdbms_depend servers/slapd/back-sql/examples +%if %suse_version < 1130 # install 2.3 slapcat install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat %endif +%endif rm -f $RPM_BUILD_ROOT/usr/lib/openldap/modules/*.a rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-dnssrv.5 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-ndb.5 @@ -331,7 +336,6 @@ %config /etc/sysconfig/SuSEfirewall2.d/services/openldap /usr/sbin/rcldap /usr/sbin/slap* -/usr/sbin/openldap-2.3-slapcat %dir /etc/openldap %dir %attr(0770, ldap, ldap) /etc/openldap/slapd.d %dir /etc/openldap/schema @@ -362,6 +366,11 @@ %doc doc/drafts doc/guide %doc README.update EOF +%if %suse_version < 1130 +cat >>openldap2.filelist <<EOF +/usr/sbin/openldap-2.3-slapcat +EOF +%endif # cat > openldap2-client.filelist <<EOF %dir /etc/openldap @@ -411,7 +420,7 @@ cat > openldap2-back-sql.filelist <<EOF /usr/lib/openldap/modules/back_sql* %doc %{_mandir}/man5/slapd-sql.* -%doc servers/slapd/back-sql/rdbms_depend +%doc servers/slapd/back-sql/examples %doc servers/slapd/back-sql/docs/bugs %doc servers/slapd/back-sql/docs/install EOF @@ -450,91 +459,6 @@ fi %{fillup_and_insserv -n openldap ldap} %{remove_and_set -n openldap OPENLDAP_RUN_DB_RECOVER} -# convert database if needed -if [ -f /etc/openldap/UPDATE_NEEDED ] ; then - read SCHEMA_BACKUP < /etc/openldap/UPDATE_NEEDED - SLAPD_CONF=/etc/openldap/slapd.conf - sed -e "s;/etc/openldap/schema/;$SCHEMA_BACKUP/;g" \ - < $SLAPD_CONF > $SCHEMA_BACKUP/slapd.conf.update - LOGFILE="slaptool.log" - BACKENDS=`grep ^database $SLAPD_CONF | awk '{print $2}'` - DIRECTORIES=(`grep ^directory $SLAPD_CONF | awk '{print $2}'`) - MSG="" - db_num=0 - dir_num=0 - restart="" - /etc/init.d/ldap status 2&>1 > /dev/null - if [ "$?" = "0" ]; then - /etc/init.d/ldap stop - restart="1" - fi - for i in $BACKENDS; do - db_num=$((db_num+1)); - if [ "x$i" = "xbdb" ] || [ "x$i" = "xhdb" ] || [ "x$i" = "xldbm" ] ; then - db_dir=${DIRECTORIES[$dir_num]}; - if [ -f $db_dir/id2entry.bdb ] || [ -f $db_dir/id2entry.dbb ] ; then - rm $db_dir/__db* ; - mkdir $db_dir/db_bak ; - echo "Dumping database to: $db_dir/ldapbak.ldif.$db_num" ; - /usr/sbin/openldap-2.3-slapcat -T c \ - -f $SCHEMA_BACKUP/slapd.conf.update \ - -n $db_num -l $db_dir/ldapbak.ldif.$db_num 2>> $db_dir/$LOGFILE; - if [ "x$i" = "xldbm" ] ; then - mv $db_dir/*.dbb $db_dir/db_bak/ ; - else - mv $db_dir/*.bdb $db_dir/db_bak/ ; - mv $db_dir/log.* $db_dir/db_bak/ ; - fi - mv $db_dir/alock $db_dir/db_bak/ ; - rm -f $db_dir/__db* ; - fi - dir_num=$((dir_num+1)); - fi - done - db_num=0 - dir_num=0 - sed -i -e "s;ldbm;bdb;g" $SLAPD_CONF - for i in $BACKENDS; do - db_num=$((db_num+1)); - if [ "x$i" = "xbdb" ] || [ "x$i" = "xhdb" ] || [ "x$i" = "xldbm" ] ; then - db_dir=${DIRECTORIES[$dir_num]}; - if [ -s $db_dir/ldapbak.ldif.$db_num ] ; then - if [ `wc -l $db_dir/ldapbak.ldif.$db_num | awk '{print $1}'` -lt 2500000 ]; then - if [ "x$i" = "xldbm" ] ; then - echo "Converting $i database to bdb in $db_dir" ; - # Create default DB_CONFIG for better performance - echo "set_cachesize 0 15000000 1" > $db_dir/DB_CONFIG - echo "set_lg_regionmax 262144" >> $db_dir/DB_CONFIG - echo "set_lg_bsize 2097152" >> $db_dir/DB_CONFIG - echo "set_flags DB_LOG_AUTOREMOVE" >> $db_dir/DB_CONFIG - else - echo "Restoring $i database in $db_dir" ; - fi - slapadd -q -n $db_num -f $SLAPD_CONF -l $db_dir/ldapbak.ldif.$db_num 2>> $db_dir/$LOGFILE ; - if [ $? -ne 0 ]; then - MSG="$MSG\nFailed to restore database in $db_dir"; - MSG="$MSG\nPlease restore manually from the LDIF dump $db_dir/ldapbak.ldif.$db_num\n"; - else - rm -f $db_dir/ldapbak.ldif.$db_num - rm -rf $db_dir/db_bak/ - fi - else - MSG="$MSG\nPlease restore the database in $db_dir manually by using"; - MSG="$MSG\nslapadd with the LDIF dump $db_dir/ldapbak.ldif.$db_num\n"; - fi - fi - dir_num=$((dir_num+1)); - fi - done - if [ "$MSG" ] ; then - echo -e "$MSG"; - else - rm -f /etc/openldap/UPDATE_NEEDED ; - if [ $restart ]; then - /etc/init.d/ldap start - fi - fi -fi %preun %stop_on_removal ldap ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.r2dDe7/_old 2010-10-01 23:59:56.000000000 +0200 +++ /var/tmp/diff_new_pack.r2dDe7/_new 2010-10-01 23:59:56.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif Version: 2.4.23 -Release: 1 +Release: 2 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 %if "%{name}" == "openldap2" @@ -239,6 +239,7 @@ make depend make %{?jobs:-j%jobs} %if "%{name}" == "openldap2" +%if %suse_version < 1130 # build a static slapcat binary from the OpenLDAP 2.3 release # to be able to update existing databases cd ../openldap-2.3.37 @@ -257,6 +258,7 @@ make depend make %{?jobs:-j%jobs} %endif +%endif %check %if %run_test_suite @@ -310,9 +312,12 @@ rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example +mv servers/slapd/back-sql/rdbms_depend servers/slapd/back-sql/examples +%if %suse_version < 1130 # install 2.3 slapcat install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat %endif +%endif rm -f $RPM_BUILD_ROOT/usr/lib/openldap/modules/*.a rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-dnssrv.5 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-ndb.5 @@ -331,7 +336,6 @@ %config /etc/sysconfig/SuSEfirewall2.d/services/openldap /usr/sbin/rcldap /usr/sbin/slap* -/usr/sbin/openldap-2.3-slapcat %dir /etc/openldap %dir %attr(0770, ldap, ldap) /etc/openldap/slapd.d %dir /etc/openldap/schema @@ -362,6 +366,11 @@ %doc doc/drafts doc/guide %doc README.update EOF +%if %suse_version < 1130 +cat >>openldap2.filelist <<EOF +/usr/sbin/openldap-2.3-slapcat +EOF +%endif # cat > openldap2-client.filelist <<EOF %dir /etc/openldap @@ -411,7 +420,7 @@ cat > openldap2-back-sql.filelist <<EOF /usr/lib/openldap/modules/back_sql* %doc %{_mandir}/man5/slapd-sql.* -%doc servers/slapd/back-sql/rdbms_depend +%doc servers/slapd/back-sql/examples %doc servers/slapd/back-sql/docs/bugs %doc servers/slapd/back-sql/docs/install EOF @@ -450,91 +459,6 @@ fi %{fillup_and_insserv -n openldap ldap} %{remove_and_set -n openldap OPENLDAP_RUN_DB_RECOVER} -# convert database if needed -if [ -f /etc/openldap/UPDATE_NEEDED ] ; then - read SCHEMA_BACKUP < /etc/openldap/UPDATE_NEEDED - SLAPD_CONF=/etc/openldap/slapd.conf - sed -e "s;/etc/openldap/schema/;$SCHEMA_BACKUP/;g" \ - < $SLAPD_CONF > $SCHEMA_BACKUP/slapd.conf.update - LOGFILE="slaptool.log" - BACKENDS=`grep ^database $SLAPD_CONF | awk '{print $2}'` - DIRECTORIES=(`grep ^directory $SLAPD_CONF | awk '{print $2}'`) - MSG="" - db_num=0 - dir_num=0 - restart="" - /etc/init.d/ldap status 2&>1 > /dev/null - if [ "$?" = "0" ]; then - /etc/init.d/ldap stop - restart="1" - fi - for i in $BACKENDS; do - db_num=$((db_num+1)); - if [ "x$i" = "xbdb" ] || [ "x$i" = "xhdb" ] || [ "x$i" = "xldbm" ] ; then - db_dir=${DIRECTORIES[$dir_num]}; - if [ -f $db_dir/id2entry.bdb ] || [ -f $db_dir/id2entry.dbb ] ; then - rm $db_dir/__db* ; - mkdir $db_dir/db_bak ; - echo "Dumping database to: $db_dir/ldapbak.ldif.$db_num" ; - /usr/sbin/openldap-2.3-slapcat -T c \ - -f $SCHEMA_BACKUP/slapd.conf.update \ - -n $db_num -l $db_dir/ldapbak.ldif.$db_num 2>> $db_dir/$LOGFILE; - if [ "x$i" = "xldbm" ] ; then - mv $db_dir/*.dbb $db_dir/db_bak/ ; - else - mv $db_dir/*.bdb $db_dir/db_bak/ ; - mv $db_dir/log.* $db_dir/db_bak/ ; - fi - mv $db_dir/alock $db_dir/db_bak/ ; - rm -f $db_dir/__db* ; - fi - dir_num=$((dir_num+1)); - fi - done - db_num=0 - dir_num=0 - sed -i -e "s;ldbm;bdb;g" $SLAPD_CONF - for i in $BACKENDS; do - db_num=$((db_num+1)); - if [ "x$i" = "xbdb" ] || [ "x$i" = "xhdb" ] || [ "x$i" = "xldbm" ] ; then - db_dir=${DIRECTORIES[$dir_num]}; - if [ -s $db_dir/ldapbak.ldif.$db_num ] ; then - if [ `wc -l $db_dir/ldapbak.ldif.$db_num | awk '{print $1}'` -lt 2500000 ]; then - if [ "x$i" = "xldbm" ] ; then - echo "Converting $i database to bdb in $db_dir" ; - # Create default DB_CONFIG for better performance - echo "set_cachesize 0 15000000 1" > $db_dir/DB_CONFIG - echo "set_lg_regionmax 262144" >> $db_dir/DB_CONFIG - echo "set_lg_bsize 2097152" >> $db_dir/DB_CONFIG - echo "set_flags DB_LOG_AUTOREMOVE" >> $db_dir/DB_CONFIG - else - echo "Restoring $i database in $db_dir" ; - fi - slapadd -q -n $db_num -f $SLAPD_CONF -l $db_dir/ldapbak.ldif.$db_num 2>> $db_dir/$LOGFILE ; - if [ $? -ne 0 ]; then - MSG="$MSG\nFailed to restore database in $db_dir"; - MSG="$MSG\nPlease restore manually from the LDIF dump $db_dir/ldapbak.ldif.$db_num\n"; - else - rm -f $db_dir/ldapbak.ldif.$db_num - rm -rf $db_dir/db_bak/ - fi - else - MSG="$MSG\nPlease restore the database in $db_dir manually by using"; - MSG="$MSG\nslapadd with the LDIF dump $db_dir/ldapbak.ldif.$db_num\n"; - fi - fi - dir_num=$((dir_num+1)); - fi - done - if [ "$MSG" ] ; then - echo -e "$MSG"; - else - rm -f /etc/openldap/UPDATE_NEEDED ; - if [ $restart ]; then - /etc/init.d/ldap start - fi - fi -fi %preun %stop_on_removal ldap ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-pkg-bindings for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at Fri Oct 1 23:59:42 CEST 2010. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2010-04-21 21:17:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2010-09-30 19:45:39.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Sep 30 17:32:48 UTC 2010 - lslezak(a)suse.cz + +- don't use spaces in repo alias (bnc#596950) +- 2.20.1 + +------------------------------------------------------------------- +Thu Sep 30 16:23:06 UTC 2010 - lslezak(a)suse.cz + +- don't preselect locked patches (bnc#627316) +- 2.20.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-pkg-bindings-2.19.1.tar.bz2 New: ---- yast2-pkg-bindings-2.20.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.G9aQeU/_old 2010-10-01 23:59:26.000000000 +0200 +++ /var/tmp/diff_new_pack.G9aQeU/_new 2010-10-01 23:59:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.19.1) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.20.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Name: yast2-pkg-bindings-devel-doc -Version: 2.19.1 +Version: 2.20.1 Release: 1 License: GPL Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.19.1.tar.bz2 +Source0: yast2-pkg-bindings-2.20.1.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) @@ -42,7 +42,7 @@ from the pkg-bindings sources. %prep -%setup -n yast2-pkg-bindings-2.19.1 +%setup -n yast2-pkg-bindings-2.20.1 # build only documentation, ignore all other directories echo "doc" > SUBDIRS ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.G9aQeU/_old 2010-10-01 23:59:26.000000000 +0200 +++ /var/tmp/diff_new_pack.G9aQeU/_new 2010-10-01 23:59:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.19.1) +# spec file for package yast2-pkg-bindings (Version 2.20.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-pkg-bindings -Version: 2.19.1 +Version: 2.20.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.19.1.tar.bz2 +Source0: yast2-pkg-bindings-2.20.1.tar.bz2 Prefix: /usr @@ -42,7 +42,7 @@ library in YaST2. %prep -%setup -n yast2-pkg-bindings-2.19.1 +%setup -n yast2-pkg-bindings-2.20.1 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS ++++++ yast2-pkg-bindings-2.19.1.tar.bz2 -> yast2-pkg-bindings-2.20.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.19.1/VERSION new/yast2-pkg-bindings-2.20.1/VERSION --- old/yast2-pkg-bindings-2.19.1/VERSION 2010-04-21 19:25:24.000000000 +0200 +++ new/yast2-pkg-bindings-2.20.1/VERSION 2010-09-30 19:20:06.000000000 +0200 @@ -1 +1 @@ -2.19.1 +2.20.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.19.1/src/Resolvable_Patches.cc new/yast2-pkg-bindings-2.20.1/src/Resolvable_Patches.cc --- old/yast2-pkg-bindings-2.19.1/src/Resolvable_Patches.cc 2009-04-29 12:58:11.000000000 +0200 +++ new/yast2-pkg-bindings-2.20.1/src/Resolvable_Patches.cc 2010-09-30 18:26:38.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Resolvable_Patches.cc 57028 2009-04-29 10:58:09Z lslezak $ + File: $Id: Resolvable_Patches.cc 62512 2010-09-30 16:26:37Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Patch related functions Namespace: Pkg @@ -95,7 +95,7 @@ y2milestone("Procesing patch %s", (*it)->name().c_str()); zypp::ui::Selectable::Ptr s = *it; - if (s && s->isNeeded()) + if (s && s->isNeeded() && !s->isUnwanted()) { zypp::Patch::constPtr patch = zypp::dynamic_pointer_cast<const zypp::Patch> (s->candidateObj().resolvable()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.19.1/src/Source_Create.cc new/yast2-pkg-bindings-2.20.1/src/Source_Create.cc --- old/yast2-pkg-bindings-2.19.1/src/Source_Create.cc 2009-10-30 11:36:43.000000000 +0100 +++ new/yast2-pkg-bindings-2.20.1/src/Source_Create.cc 2010-09-30 19:45:18.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Create.cc 59073 2009-10-16 11:29:12Z lslezak $ + File: $Id: Source_Create.cc 62519 2010-09-30 17:45:17Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions related to repository registration Namespace: Pkg @@ -654,7 +654,11 @@ try { - RepoId id = createManagedSource(url, it->_dir, type, it->_name, pkgprogress, subprogrcv); + // don't use spaces in alias + std::string alias(it->_name); + zypp::str::replaceAll(alias, " ", "-"); + + RepoId id = createManagedSource(url, it->_dir, type, alias, pkgprogress, subprogrcv); new_repos.push_back(id); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-installation for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Fri Oct 1 23:59:14 CEST 2010. -------- --- yast2-installation/yast2-installation.changes 2010-06-02 14:07:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2010-09-30 20:12:03.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 30 17:33:48 UTC 2010 - lslezak(a)suse.cz + +- don't use spaces in repo alias (bnc#596950) +- inst_addon_update_sources.ycp - removed obsoleted ZMD sync call +- 2.20.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.19.20.tar.bz2 New: ---- yast2-installation-2.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.Ca97Vc/_old 2010-10-01 23:58:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Ca97Vc/_new 2010-10-01 23:58:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.19.20) +# spec file for package yast2-installation (Version 2.20.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-installation -Version: 2.19.20 +Version: 2.20.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.19.20.tar.bz2 +Source0: yast2-installation-2.20.0.tar.bz2 Prefix: /usr @@ -136,7 +136,7 @@ System installation code as present on installation media. %prep -%setup -n yast2-installation-2.19.20 +%setup -n yast2-installation-2.20.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-installation-2.19.20.tar.bz2 -> yast2-installation-2.20.0.tar.bz2 ++++++ ++++ 19744 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/VERSION new/yast2-installation-2.20.0/VERSION --- old/yast2-installation-2.19.20/VERSION 2010-06-02 13:52:21.000000000 +0200 +++ new/yast2-installation-2.20.0/VERSION 2010-09-30 19:34:19.000000000 +0200 @@ -1 +1 @@ -2.19.20 +2.20.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/configure.in new/yast2-installation-2.20.0/configure.in --- old/yast2-installation-2.19.20/configure.in 2010-06-02 13:58:34.000000000 +0200 +++ new/yast2-installation-2.20.0/configure.in 2009-04-28 18:15:57.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.19.20, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.18.13, http://bugs.opensuse.org/, yast2-installation) 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.19.20" +VERSION="2.18.13" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/control/control.openSUSE.xml new/yast2-installation-2.20.0/control/control.openSUSE.xml --- old/yast2-installation-2.19.20/control/control.openSUSE.xml 2010-03-08 12:42:42.000000000 +0100 +++ new/yast2-installation-2.20.0/control/control.openSUSE.xml 2010-09-30 18:20:26.000000000 +0200 @@ -192,16 +192,15 @@ <online_repos_preselected config:type="boolean">false</online_repos_preselected>  - <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_112_Servers.xml</external_sources_link> + <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_113_Servers.xml</external_sources_link> -  - <dropped_packages>FreeNX NX RealPlayer ant-jai art-sharp asterisk asterisk-alsa asterisk-capi asterisk-spandsp asterisk-zaptel astools avalon-framework avalon-framework-manual avalon-logkit avalon-logkit-javadoc avmailgate bbtools bitchx blackbox colorgcc compat-curl2 cpp41 cpp42 cups-SUSE-ppds-dat db42 dbus-1-gtk devs dockutils dragonegg ejb-javadoc freeciv ftgl gal2 gcc41 gcc41-32bit gcc41-ada gcc41-c++ gcc41-fortran gcc41-fortran-32bit gcc41-gij gcc41-gij-32bit gcc41-info gcc41-java gcc41-locale gcc41-obj-c++ gcc41-objc gcc41-objc-32bitgcc42 gcc42-32bit gcc42-c++ gcc42-fortran gcc42-fortran-32bit gcc42-gij gcc42-info gcc42-java gcc42-objc gcc42-objc-32bit gconf-sharp gecko-sharp glade-sharp glib-sharp gnome-cups-manager gnome-filesystem gnome-keyring-manager gnome-mime-data gnome-printer-add gnome-sharp gtk-engines gtk-qt-engine gtk-sharp gtk-sharp-complete gtk-sharp-gapi gtkglarea gtkhtml-sharp2 hermes ial indeview ipgrab ipw3945d ircd jaf-demo jaf-javadoc jaf-manual jai java-1_4_2-cacao java-1_4_2-cacao-devel java-1_4_2-sun java-1_4_2-sun-devel java-1_4_2-sun-plugin javamail-manual jms-javadoc jmx jmx-javadoc jta jta-javadoc kbilliards kfs kino knx kssh libGraphicsMagick1 libMagick10 libWand10 libcurl2 libdjvulibre15 libdvdread3 libexiv2 libgcc41 libgcc41-32bit libgcj41 libgcj41-32bit libgcj41-devel libgcj42 libgcj42-devel libgfortran42 libgfortran42-32bit libgmime-2_0-2 libgpod libgpod2 libiniparser libiniparser-32bit libipoddevice libkdcraw1 libkexiv2 libltdl-3-32bit libmtp libmudflap41 libmudflap41-32bit libmudflap42 libmudflap42-32bit libpisync0 libpri libqtpod librasqal0 libsoprano3 libsoprano3-32bit libstdc++41 libstdc++41-32bit libstdc++41-devel libstdc++42-devel libusb libzypp-zmd-backend limal-bootloader man-pages-de multisync openbox perl-Xmms planmaker powersave-libs qjackconnect radiusclient resmgr-32bit rsaref rsvg-sharp2 rubygem-actionwebservice rug samba-pdb sax2-libsax-csharp siga simutrans sqlite-zmd supertux synce synce-kde tei_3 textmaker tomcat5 tomcat55 tomcat55-common-lib tomcat55-jasper tomcat55-jsp-2_0-api tomcat55-server-lib tomcat55-servlet-2_4-api tpb unace varmon vte-sharp vte-sharp2 websh wlan-kmp-xen xen-doc-ps xgl xgl-hardware-list xmms xmms-jack xmms-lib xmoto yast2-bluetooth yast2-bootfloppy yast2-power-management yast2-powertweak zaptel zaptel-kmp-default zen-updater zmd zope</dropped_packages> + <dropped_packages></dropped_packages> <extra_urls config:type="list">  <extra_url> - <baseurl>http://download.opensuse.org/update/11.3/</baseurl> + <baseurl>http://download.opensuse.org/update/11.4/</baseurl> <alias>repo-update</alias> - <name>openSUSE-11.3-Update</name> + <name>openSUSE-11.4-Update</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -210,36 +209,36 @@  <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.3/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/11.4/repo/oss/</baseurl> <alias>repo-oss</alias> - <name>openSUSE-11.3-Oss</name> + <name>openSUSE-11.4-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.3/repo/non-oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/11.4/repo/non-oss/</baseurl> <alias>repo-non-oss</alias> - <name>openSUSE-11.3-Non-Oss</name> + <name>openSUSE-11.4-Non-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/distribution/11.3/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/debug/distribution/11.4/repo/oss/</baseurl> <alias>repo-debug</alias> - <name>openSUSE-11.3-Debug</name> + <name>openSUSE-11.4-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/source/distribution/11.3/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/source/distribution/11.4/repo/oss/</baseurl> <alias>repo-source</alias> - <name>openSUSE-11.3-Source</name> + <name>openSUSE-11.4-Source</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/missing new/yast2-installation-2.20.0/missing --- old/yast2-installation-2.19.20/missing 2010-06-02 13:58:38.000000000 +0200 +++ new/yast2-installation-2.20.0/missing 2009-04-28 18:16:03.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,9 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,9 +89,6 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -107,22 +106,15 @@ esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. +# the program). case $1 in - lex*|yacc*) + lex|yacc) # Not GNU programs, they don't have --version. ;; - tar*) + tar) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -146,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $program in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -156,7 +148,7 @@ touch aclocal.m4 ;; - autoconf*) + autoconf) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -165,7 +157,7 @@ touch configure ;; - autoheader*) + autoheader) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -195,7 +187,7 @@ while read f; do touch "$f"; done ;; - autom4te*) + autom4te) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -218,7 +210,7 @@ fi ;; - bison*|yacc*) + bison|yacc) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -248,7 +240,7 @@ fi ;; - lex*|flex*) + lex|flex) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -271,7 +263,7 @@ fi ;; - help2man*) + help2man) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -285,11 +277,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit $? + exit 1 fi ;; - makeinfo*) + makeinfo) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -318,7 +310,7 @@ touch $file ;; - tar*) + tar) shift # We have already tried tar in the generic part. @@ -371,6 +363,5 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.20.0/src/clients/inst_addon_update_sources.ycp --- old/yast2-installation-2.19.20/src/clients/inst_addon_update_sources.ycp 2009-12-09 12:44:38.000000000 +0100 +++ new/yast2-installation-2.20.0/src/clients/inst_addon_update_sources.ycp 2010-09-30 20:05:24.000000000 +0200 @@ -18,6 +18,7 @@ import "SourceManager"; import "Report"; import "Installation"; +import "String"; include "packager/inst_source_dialogs.ycp"; @@ -84,21 +85,23 @@ { Popup::ShowFeedback (heading, message); - list<integer> added_ids = []; foreach (string url, string name, addUrls, { boolean again = true; while (again) { // BNC #557723: Repositories migh be created without access to network // Libzypp must not probe the repo + + // don't use spaces in alias (hard to use with zypper) + string alias = String::Replace((size(name) > 0 ? name : url), " ", "-"); + map <string,any> repo_prop = $[ "enabled" : true, "autorefresh" : true, "name" : (size(name) > 0 ? name : url), - "alias" : (size(name) > 0 ? name : url), + "alias" : alias, "base_urls" : [url], "prod_dir" : "/", - ]; integer srcid = Pkg::RepositoryAdd (repo_prop); @@ -124,16 +127,11 @@ // everything is ok } else { - added_ids = add (added_ids, srcid); again = false; } } }); - y2milestone ("syncing to zmd"); - boolean synced = SourceManager::SyncAddedAndDeleted (added_ids, []); - y2milestone ("sync status: %1", synced); - Popup::ClearFeedback (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/src/clients/inst_mode.ycp new/yast2-installation-2.20.0/src/clients/inst_mode.ycp --- old/yast2-installation-2.19.20/src/clients/inst_mode.ycp 2010-06-02 13:30:36.000000000 +0200 +++ new/yast2-installation-2.20.0/src/clients/inst_mode.ycp 2010-06-29 15:16:10.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: inst_mode.ycp 60026 2009-12-09 14:17:18Z kmachalkova $ + * $Id: inst_mode.ycp 62084 2010-06-02 12:00:45Z jsrain $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/src/clients/inst_pre_install.ycp new/yast2-installation-2.20.0/src/clients/inst_pre_install.ycp --- old/yast2-installation-2.19.20/src/clients/inst_pre_install.ycp 2010-05-27 13:26:09.000000000 +0200 +++ new/yast2-installation-2.20.0/src/clients/inst_pre_install.ycp 2010-09-30 18:20:26.000000000 +0200 @@ -135,7 +135,7 @@ } // mounting read-only - if (! (boolean) SCR::Execute(.target.mount, [partition_device, mnt_tmpdir], "-o ro")) { + if (! (boolean) SCR::Execute(.target.mount, [partition_device, mnt_tmpdir], "-o ro,noatime")) { y2error("Mounting falied!"); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/src/clients/inst_suseconfig.ycp new/yast2-installation-2.20.0/src/clients/inst_suseconfig.ycp --- old/yast2-installation-2.19.20/src/clients/inst_suseconfig.ycp 2010-04-08 15:06:03.000000000 +0200 +++ new/yast2-installation-2.20.0/src/clients/inst_suseconfig.ycp 2010-09-30 18:20:26.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Andreas Schwab <schwab(a)suse.de> * Stefan Hundhammer <sh(a)suse.de> * - * $Id: inst_suseconfig.ycp 61456 2010-03-24 07:43:57Z lslezak $ + * $Id: inst_suseconfig.ycp 62463 2010-09-01 08:26:08Z aschnell $ * * Purpose: * - shows the "Finishing the installation" frame @@ -215,7 +215,7 @@ // The final LogView line to be displayed after SuSEconfig etc. is done. - if (!Mode::commandline ()) + if (!automatic_configuration && !Mode::commandline ()) UI::ChangeWidget( `id(`log), `LastLine, "\n" + _("Done.") + "\n" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/src/inst_finish/umount_finish.ycp new/yast2-installation-2.20.0/src/inst_finish/umount_finish.ycp --- old/yast2-installation-2.19.20/src/inst_finish/umount_finish.ycp 2009-03-06 08:21:34.000000000 +0100 +++ new/yast2-installation-2.20.0/src/inst_finish/umount_finish.ycp 2010-09-30 18:20:26.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: umount_finish.ycp 54888 2009-01-22 11:47:19Z locilka $ + * $Id: umount_finish.ycp 62433 2010-08-25 13:58:20Z elvigia $ * */ @@ -104,7 +104,7 @@ y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); } else { y2warning ("Umount failed, trying to remount read only..."); - string cmd = sformat ("sync; mount -o remount,ro '%1'; umount -l -f '%1';", String::Quote (umount_this)); + string cmd = sformat ("sync; mount -o remount,noatime,ro '%1'; umount -l -f '%1';", String::Quote (umount_this)); y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); } } @@ -146,7 +146,7 @@ y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); } else { y2warning ("Umount failed, trying to remount read only..."); - string cmd = sformat ("mount -o remount,ro '%1'; umount -l -f '%1';", String::Quote (tmp)); + string cmd = sformat ("mount -o remount,ro,noatime '%1'; umount -l -f '%1';", String::Quote (tmp)); y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/src/modules/ImageInstallation.ycp new/yast2-installation-2.20.0/src/modules/ImageInstallation.ycp --- old/yast2-installation-2.19.20/src/modules/ImageInstallation.ycp 2009-12-09 12:44:28.000000000 +0100 +++ new/yast2-installation-2.20.0/src/modules/ImageInstallation.ycp 2010-09-30 18:20:26.000000000 +0200 @@ -376,7 +376,7 @@ y2milestone ("Executing %1 returned %2", cmd, out); y2milestone ("Mounting the image"); - cmd = sformat ("mount -o loop %1 %2", image, tmpdir); + cmd = sformat ("mount -o noatime,loop %1 %2", image, tmpdir); out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); @@ -426,7 +426,7 @@ string cmd = sformat ("test -d %1 || mkdir -p %1", target); map out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); - cmd = sformat ("mount -o loop %1 %2", image, target); + cmd = sformat ("mount -o noatime,loop %1 %2", image, target); out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); return out["exit"]:-1 == 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/src/modules/SystemFilesCopy.ycp new/yast2-installation-2.20.0/src/modules/SystemFilesCopy.ycp --- old/yast2-installation-2.19.20/src/modules/SystemFilesCopy.ycp 2009-05-13 13:52:37.000000000 +0200 +++ new/yast2-installation-2.20.0/src/modules/SystemFilesCopy.ycp 2010-09-30 18:20:26.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Functionality for copying files from another systems * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: SystemFilesCopy.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: SystemFilesCopy.ycp 62433 2010-08-25 13:58:20Z elvigia $ * * Functionality for copying files from any not-mounted systems * to inst-sys and from inst-sys to just-installed system. @@ -140,7 +140,7 @@ ); y2milestone("Mounting %1 to %2", partition, tmp_mount_directory); - if (! (boolean) SCR::Execute(.target.mount, [partition, tmp_mount_directory], "-o ro")) { + if (! (boolean) SCR::Execute(.target.mount, [partition, tmp_mount_directory], "-o ro,noatime")) { y2error("Mounting failed!"); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.19.20/startup/First-Stage/F09-start new/yast2-installation-2.20.0/startup/First-Stage/F09-start --- old/yast2-installation-2.19.20/startup/First-Stage/F09-start 2007-05-18 10:06:50.000000000 +0200 +++ new/yast2-installation-2.20.0/startup/First-Stage/F09-start 2010-09-30 18:20:26.000000000 +0200 @@ -23,7 +23,7 @@ if [ -r /update/y2update/y2update.gz ] ; then gunzip -c /update/y2update/y2update.gz > /dev/ram5 mkdir -p /y2update - if mount /dev/ram5 /y2update ; then + if mount -o noatime /dev/ram5 /y2update ; then log "\tPacked extension disk... OK" UPDATE_MOUNTED=true else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-apparmor for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package yast2-apparmor for openSUSE:Factory checked in at Fri Oct 1 23:58:10 CEST 2010. -------- --- yast2-apparmor/yast2-apparmor.changes 2009-11-23 16:18:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-apparmor/yast2-apparmor.changes 2010-09-02 15:21:23.000000000 +0200 @@ -1,0 +2,19 @@ +Thu Sep 2 15:04:21 CEST 2010 - kmachalkova(a)suse.cz + +- Install Notify.pm into @INC so that Perl can see it (bnc#635830) +- 2.20.0 + +------------------------------------------------------------------- +Tue Apr 6 11:04:52 CEST 2010 - juhliarik(a)suse.cz + +- updated "names" in .desktop files for searching AppArmor related + modules in YaST (bnc#590929) + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-apparmor-2.19.0.tar.bz2 New: ---- yast2-apparmor-2.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-apparmor.spec ++++++ --- /var/tmp/diff_new_pack.ZOgD5y/_old 2010-10-01 23:57:47.000000000 +0200 +++ /var/tmp/diff_new_pack.ZOgD5y/_new 2010-10-01 23:57:47.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-apparmor (Version 2.19.0) +# spec file for package yast2-apparmor (Version 2.20.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,19 +19,24 @@ Name: yast2-apparmor -Version: 2.19.0 +Version: 2.20.0 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-apparmor-2.19.0.tar.bz2 +Source0: yast2-apparmor-2.20.0.tar.bz2 + Prefix: /usr + Group: Productivity/Security -License: GPL v2 or later +License: GPLv2+ + Summary: YaST2 - Plugins for AppArmor Profile Management Requires: yast2 perl-TimeDate BuildArch: noarch Obsoletes: yast2-subdomain Provides: yast2-subdomain BuildRequires: update-desktop-files + BuildRequires: yast2 yast2-devtools %description @@ -42,14 +47,16 @@ SubDomain. %prep -%setup -n yast2-apparmor-2.19.0 +%setup -n yast2-apparmor-2.20.0 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -78,7 +85,8 @@ /usr/share/YaST2/modules /usr/share/applications/YaST2 /usr/lib/YaST2/servers_non_y2 -/usr/lib/perl5/vendor_perl/* +%dir %{perl_vendorlib}/Immunix +%{perl_vendorlib}/Immunix/Notify.pm # license is questionable, PDB says GPL v2 or later #%doc COPYING.LGPL %dir %attr(-,root,root) /etc/apparmor ++++++ yast2-apparmor-2.19.0.tar.bz2 -> yast2-apparmor-2.20.0.tar.bz2 ++++++ ++++ 13573 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/VERSION new/yast2-apparmor-2.20.0/VERSION --- old/yast2-apparmor-2.19.0/VERSION 2009-11-23 16:13:10.000000000 +0100 +++ new/yast2-apparmor-2.20.0/VERSION 2010-09-02 14:56:55.000000000 +0200 @@ -1 +1 @@ -2.19.0 +2.20.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/configure.in new/yast2-apparmor-2.20.0/configure.in --- old/yast2-apparmor-2.19.0/configure.in 2009-11-23 16:15:16.000000000 +0100 +++ new/yast2-apparmor-2.20.0/configure.in 2010-08-31 17:45:26.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-apparmor dnl -dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-apparmor, 2.19.0, http://bugs.opensuse.org/, yast2-apparmor) @@ -92,6 +92,9 @@ +PERL_VENDORLIB=`perl -V:vendorlib | sed "s!.*='!!;s!'.*!!"` +AC_SUBST(PERL_VENDORLIB) + dnl Checks for programs. AC_PROG_INSTALL dnl The YCP interpreter checks whether dependent ybc files are older diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/configure.in.in new/yast2-apparmor-2.20.0/configure.in.in --- old/yast2-apparmor-2.19.0/configure.in.in 2009-06-24 12:53:10.000000000 +0200 +++ new/yast2-apparmor-2.20.0/configure.in.in 2010-09-01 10:38:13.000000000 +0200 @@ -4,6 +4,9 @@ @YAST2-INIT-COMMON@ @YAST2-INIT-YCP@ +PERL_VENDORLIB=`perl -V:vendorlib | sed "s!.*='!!;s!'.*!!"` +AC_SUBST(PERL_VENDORLIB) + ## some common checks @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-YCP@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/missing new/yast2-apparmor-2.20.0/missing --- old/yast2-apparmor-2.19.0/missing 2009-11-23 16:15:23.000000000 +0100 +++ new/yast2-apparmor-2.20.0/missing 2010-08-31 17:45:34.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/src/desktop/SD_Reports.desktop new/yast2-apparmor-2.20.0/src/desktop/SD_Reports.desktop --- old/yast2-apparmor-2.19.0/src/desktop/SD_Reports.desktop 2009-11-11 17:14:06.000000000 +0100 +++ new/yast2-apparmor-2.20.0/src/desktop/SD_Reports.desktop 2010-01-13 18:31:43.000000000 +0100 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_view_profile -Exec=/sbin/yast2 SD_Report +Exec=xdg-su -c "/sbin/yast2 SD_Report" Name=AppArmor Reports GenericName=AppArmor Configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/src/desktop/SD_add_profile.desktop new/yast2-apparmor-2.20.0/src/desktop/SD_add_profile.desktop --- old/yast2-apparmor-2.19.0/src/desktop/SD_add_profile.desktop 2009-11-11 17:14:06.000000000 +0100 +++ new/yast2-apparmor-2.20.0/src/desktop/SD_add_profile.desktop 2010-01-13 18:31:43.000000000 +0100 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_add_profile -Exec=/sbin/yast2 SD_AddProfile +Exec=xdg-su -c "/sbin/yast2 SD_AddProfile" Name=Manually Add Profile GenericName=AppArmor Configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/src/desktop/SD_control_panel.desktop new/yast2-apparmor-2.20.0/src/desktop/SD_control_panel.desktop --- old/yast2-apparmor-2.19.0/src/desktop/SD_control_panel.desktop 2009-11-11 17:14:06.000000000 +0100 +++ new/yast2-apparmor-2.20.0/src/desktop/SD_control_panel.desktop 2010-01-13 18:31:43.000000000 +0100 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_control_panel -Exec=/sbin/yast2 subdomain +Exec=xdg-su -c "/sbin/yast2 subdomain" Name=AppArmor Control Panel GenericName=AppArmor Control Panel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/src/desktop/SD_delete_profile.desktop new/yast2-apparmor-2.20.0/src/desktop/SD_delete_profile.desktop --- old/yast2-apparmor-2.19.0/src/desktop/SD_delete_profile.desktop 2009-11-11 17:14:06.000000000 +0100 +++ new/yast2-apparmor-2.20.0/src/desktop/SD_delete_profile.desktop 2010-01-13 18:31:43.000000000 +0100 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_delete_profile -Exec=/sbin/yast2 SD_DeleteProfile +Exec=xdg-su -c "/sbin/yast2 SD_DeleteProfile" Name=Delete Profile GenericName=AppArmor Configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/src/desktop/SD_edit_profile.desktop new/yast2-apparmor-2.20.0/src/desktop/SD_edit_profile.desktop --- old/yast2-apparmor-2.19.0/src/desktop/SD_edit_profile.desktop 2009-11-11 17:14:06.000000000 +0100 +++ new/yast2-apparmor-2.20.0/src/desktop/SD_edit_profile.desktop 2010-01-13 18:31:43.000000000 +0100 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_edit_profile -Exec=/sbin/yast2 SD_EditProfile +Exec=xdg-su -c "/sbin/yast2 SD_EditProfile" Name=Edit Profile GenericName=AppArmor Configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/src/desktop/SD_genprof.desktop new/yast2-apparmor-2.20.0/src/desktop/SD_genprof.desktop --- old/yast2-apparmor-2.19.0/src/desktop/SD_genprof.desktop 2009-06-24 12:53:10.000000000 +0200 +++ new/yast2-apparmor-2.20.0/src/desktop/SD_genprof.desktop 2010-08-31 17:41:27.000000000 +0200 @@ -17,8 +17,8 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_creation_wizard -Exec=/sbin/yast2 GenProf +Exec=xdg-su -c "/sbin/yast2 GenProf" Name=Add Profile Wizard -GenericName=Profile Wizard +GenericName=AppArmor Configuration StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/src/desktop/SD_logprof.desktop new/yast2-apparmor-2.20.0/src/desktop/SD_logprof.desktop --- old/yast2-apparmor-2.19.0/src/desktop/SD_logprof.desktop 2009-06-24 12:53:10.000000000 +0200 +++ new/yast2-apparmor-2.20.0/src/desktop/SD_logprof.desktop 2010-08-31 17:41:27.000000000 +0200 @@ -17,8 +17,8 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_update_wizard -Exec=/sbin/yast2 LogProf +Exec=xdg-su -c "/sbin/yast2 LogProf" Name=Update Profile Wizard -GenericName=Update Profiles +GenericName=AppArmor Configuration StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.19.0/src/perl/Makefile.am new/yast2-apparmor-2.20.0/src/perl/Makefile.am --- old/yast2-apparmor-2.19.0/src/perl/Makefile.am 2009-06-24 12:53:10.000000000 +0200 +++ new/yast2-apparmor-2.20.0/src/perl/Makefile.am 2010-09-01 10:30:12.000000000 +0200 @@ -1,7 +1,7 @@ perl_DATA = \ Notify.pm -perldir = /usr/lib/perl5/vendor_perl/Immunix +perldir = $(PERL_VENDORLIB)/Immunix EXTRA_DIST = $(perl_DATA) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 Mesa for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Fri Oct 1 23:58:02 CEST 2010. -------- --- Mesa/Mesa.changes 2010-09-27 21:26:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2010-09-30 12:04:05.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Sep 30 09:49:13 UTC 2010 - sndirsch(a)novell.com + +- commit-73dab75.diff + * i965: fallback lineloop on sandybridge for now (bfo #30420, + comment #8) + +------------------------------------------------------------------- +Wed Sep 29 12:01:23 UTC 2010 - sndirsch(a)novell.com + +- updated to MesaLib 7.9-RC2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MesaLib-7.9-rc1.tar.bz2 New: ---- MesaLib-7.9-rc2.tar.bz2 commit-73dab75.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.A53ZWL/_old 2010-10-01 23:57:46.000000000 +0200 +++ /var/tmp/diff_new_pack.A53ZWL/_new 2010-10-01 23:57:46.000000000 +0200 @@ -22,7 +22,7 @@ %define _version 7.9 Version: 7.9 -Release: 1 +Release: 2 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel @@ -43,7 +43,7 @@ %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}-rc1.tar.bz2 +Source: MesaLib-%{_version}-rc2.tar.bz2 Source1: MesaDemos-7.8.2.tar.bz2 Source2: baselibs.conf Source3: README.updates @@ -55,6 +55,7 @@ Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff # already upstream +Patch10: commit-73dab75.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -134,7 +135,7 @@ Francisco Jerez %prep -%setup -n %{name}-%{_version}-rc1 -a1 -b4 -q +%setup -n %{name}-%{_version}-rc2 -a1 -b4 -q # no need to build (GLUT-)Demos rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} # we use freeglut @@ -146,6 +147,7 @@ sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile %patch8 %patch9 -p0 +%patch10 -p1 %build ++++++ MesaLib-7.9-rc1.tar.bz2 -> MesaLib-7.9-rc2.tar.bz2 ++++++ ++++ 199027 lines of diff (skipped) ++++++ commit-73dab75.diff ++++++ commit 73dab75b4165f7d2214a68d4ba8e3cb7aab9b4ac Author: Zhenyu Wang <zhenyuw(a)linux.intel.com> Date: Sun Sep 26 13:15:39 2010 +0800 i965: fallback lineloop on sandybridge for now Until we fixed GS hang issue. diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 16331cc..6a4dda2 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -204,6 +204,13 @@ static GLboolean check_fallbacks( struct brw_context *brw, GLcontext *ctx = &brw->intel.ctx; GLuint i; + /* XXX FIXME */ + if (brw->intel.gen >= 6) { + for (i = 0; i < nr_prims; i++) + if (prim[i].mode == GL_LINE_LOOP) + return GL_TRUE; + } + /* If we don't require strict OpenGL conformance, never * use fallbacks. If we're forcing fallbacks, always * use fallfacks. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pulseaudio for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at Fri Oct 1 23:57:33 CEST 2010. -------- --- pulseaudio/pulseaudio.changes 2010-08-12 11:58:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/pulseaudio/pulseaudio.changes 2010-09-28 21:12:18.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 28 19:12:15 UTC 2010 - aj(a)suse.de + +- Recommend instead of require lang-package. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.t5IqIf/_old 2010-10-01 23:57:19.000000000 +0200 +++ /var/tmp/diff_new_pack.t5IqIf/_new 2010-10-01 23:57:19.000000000 +0200 @@ -22,7 +22,7 @@ Name: pulseaudio Summary: A Networked Sound Server Version: 0.9.21 -Release: 13 +Release: 14 License: GPLv2+ ; LGPLv2.1+ Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 @@ -120,7 +120,7 @@ BuildRequires: xorg-x11-devel PreReq: pwdutils Recommends: alsa-plugins-pulse -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang Requires: udev >= 146 Requires: rtkit Conflicts: kernel < 2.6.31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 usbutils for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package usbutils for openSUSE:Factory checked in at Fri Oct 1 23:56:58 CEST 2010. -------- --- usbutils/usbutils.changes 2009-07-05 15:07:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/usbutils/usbutils.changes 2010-09-29 00:13:06.000000000 +0200 @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Wed Sep 29 00:12:12 CEST 2010 - ro(a)suse.de + +- add current file usb.ids as created by included script + update-usbids.sh + +------------------------------------------------------------------- +Wed Sep 29 00:05:01 CEST 2010 - ro(a)suse.de + +- update to 0.86 + - HID device robust fix + - usb-devices bugfixes + - usb.ids updated + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- usbutils-0.84.tar.bz2 New: ---- usb.ids usbutils-0.86.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbutils.spec ++++++ --- /var/tmp/diff_new_pack.dCqTW8/_old 2010-10-01 23:56:41.000000000 +0200 +++ /var/tmp/diff_new_pack.dCqTW8/_new 2010-10-01 23:56:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package usbutils (Version 0.84) +# spec file for package usbutils (Version 0.86) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,14 +21,15 @@ Name: usbutils BuildRequires: libusb-compat-devel pkg-config Url: http://sourceforge.net/projects/linux-usb/ -Version: 0.84 +Version: 0.86 Release: 1 -License: GPL v2 or later +License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tools and libraries for USB devices Group: Hardware/Other Source0: usbutils-%{version}.tar.bz2 Source1: usbutils-rpmlintrc +Source2: usb.ids %description This package contains a utility for inspecting devices connected to USB @@ -36,6 +37,7 @@ %prep %setup -q +cp %{S:2} usb.ids %build %configure \ @@ -47,16 +49,16 @@ %install make DESTDIR=$RPM_BUILD_ROOT install -mkdir $RPM_BUILD_ROOT%{_prefix}/bin ln -sv ../sbin/lsusb $RPM_BUILD_ROOT%{_prefix}/bin/lsusb %files %defattr(0644, root, root, 0755) +%attr(0644, root, root) %{_mandir}/man1/* %attr(0644, root, root) %{_mandir}/man8/* %attr(0755, root, root) %{_prefix}/bin/* %attr(0755, root, root) %{_prefix}/sbin/* %{_datadir}/usb.ids -%{_libdir}/pkgconfig/usbutils.pc +%{_datadir}/pkgconfig/usbutils.pc %doc AUTHORS ChangeLog %changelog ++++++ usb.ids ++++++ ++++ 15789 lines (skipped) ++++++ usbutils-0.84.tar.bz2 -> usbutils-0.86.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/Makefile.am new/usbutils-0.86/Makefile.am --- old/usbutils-0.84/Makefile.am 2009-06-25 18:40:59.000000000 +0200 +++ new/usbutils-0.86/Makefile.am 2009-08-18 00:23:35.000000000 +0200 @@ -11,7 +11,9 @@ lsusb sbin_SCRIPTS = \ - update-usbids.sh \ + update-usbids.sh + +bin_SCRIPTS = \ usb-devices lsusb_SOURCES = \ @@ -31,13 +33,13 @@ man_MANS = \ lsusb.8 \ - usb-devices.8 + usb-devices.1 EXTRA_DIST = \ usb.ids \ update-usbids.sh.in \ lsusb.8.in \ - usb-devices.8.in \ + usb-devices.1.in \ usb-devices \ usbutils.pc.in @@ -49,12 +51,12 @@ chmod 755 $@ lsusb.8: $(srcdir)/lsusb.8.in - sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@ + sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -usb-devices.8: $(srcdir)/usb-devices.8.in +usb-devices.1: $(srcdir)/usb-devices.1.in sed 's|VERSION|$(VERSION)|g' $< >$@ -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = usbutils.pc usbutils.pc: $(srcdir)/usbutils.pc.in @@ -63,7 +65,7 @@ DISTCLEANFILES = \ usb.ids.gz \ lsusb.8 \ - usb-devices.8 \ + usb-devices.1 \ update-usbids.sh \ usbutils.pc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/Makefile.in new/usbutils-0.86/Makefile.in --- old/usbutils-0.84/Makefile.in 2009-06-25 19:08:44.000000000 +0200 +++ new/usbutils-0.86/Makefile.in 2009-08-18 00:29:58.000000000 +0200 @@ -48,7 +48,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" \ +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(datadir)" \ "$(DESTDIR)$(pkgconfigdir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @@ -59,8 +60,9 @@ lsusb_OBJECTS = $(am_lsusb_OBJECTS) am__DEPENDENCIES_1 = lsusb_DEPENDENCIES = $(am__DEPENDENCIES_1) +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(sbin_SCRIPTS) +SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -70,6 +72,7 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(lsusb_SOURCES) DIST_SOURCES = $(lsusb_SOURCES) +man1dir = $(mandir)/man1 man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) @@ -188,7 +191,9 @@ data_DATA = usb.ids $(am__append_1) sbin_SCRIPTS = \ - update-usbids.sh \ + update-usbids.sh + +bin_SCRIPTS = \ usb-devices lsusb_SOURCES = \ @@ -208,22 +213,22 @@ man_MANS = \ lsusb.8 \ - usb-devices.8 + usb-devices.1 EXTRA_DIST = \ usb.ids \ update-usbids.sh.in \ lsusb.8.in \ - usb-devices.8.in \ + usb-devices.1.in \ usb-devices \ usbutils.pc.in -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = usbutils.pc DISTCLEANFILES = \ usb.ids.gz \ lsusb.8 \ - usb-devices.8 \ + usb-devices.1 \ update-usbids.sh \ usbutils.pc @@ -308,6 +313,25 @@ lsusb$(EXEEXT): $(lsusb_OBJECTS) $(lsusb_DEPENDENCIES) @rm -f lsusb$(EXEEXT) $(LINK) $(lsusb_OBJECTS) $(lsusb_LDADD) $(LIBS) +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done install-sbinSCRIPTS: $(sbin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @@ -423,6 +447,51 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='usbmisc.c' object='lsusb-usbmisc.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lsusb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lsusb-usbmisc.obj `if test -f 'usbmisc.c'; then $(CYGPATH_W) 'usbmisc.c'; else $(CYGPATH_W) '$(srcdir)/usbmisc.c'; fi` +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $$i; then file=$$i; \ + else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" @@ -691,7 +760,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(pkgconfigdir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(pkgconfigdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -744,13 +813,14 @@ install-dvi: install-dvi-am -install-exec-am: install-sbinPROGRAMS install-sbinSCRIPTS +install-exec-am: install-binSCRIPTS install-sbinPROGRAMS \ + install-sbinSCRIPTS install-html: install-html-am install-info: install-info-am -install-man: install-man8 +install-man: install-man1 install-man8 install-pdf: install-pdf-am @@ -777,10 +847,11 @@ ps-am: -uninstall-am: uninstall-dataDATA uninstall-man uninstall-pkgconfigDATA \ - uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS +uninstall-am: uninstall-binSCRIPTS uninstall-dataDATA uninstall-man \ + uninstall-pkgconfigDATA uninstall-sbinPROGRAMS \ + uninstall-sbinSCRIPTS -uninstall-man: uninstall-man8 +uninstall-man: uninstall-man1 uninstall-man8 .MAKE: install-am install-strip @@ -790,16 +861,17 @@ distcheck distclean distclean-compile distclean-generic \ distclean-hdr distclean-local distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dataDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man8 install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-sbinPROGRAMS install-sbinSCRIPTS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-dataDATA uninstall-man uninstall-man8 \ + info-am install install-am install-binSCRIPTS install-data \ + install-data-am install-dataDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-man8 install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-sbinPROGRAMS \ + install-sbinSCRIPTS install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-binSCRIPTS \ + uninstall-dataDATA uninstall-man uninstall-man1 uninstall-man8 \ uninstall-pkgconfigDATA uninstall-sbinPROGRAMS \ uninstall-sbinSCRIPTS @@ -812,9 +884,9 @@ chmod 755 $@ lsusb.8: $(srcdir)/lsusb.8.in - sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@ + sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -usb-devices.8: $(srcdir)/usb-devices.8.in +usb-devices.1: $(srcdir)/usb-devices.1.in sed 's|VERSION|$(VERSION)|g' $< >$@ usbutils.pc: $(srcdir)/usbutils.pc.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/NEWS new/usbutils-0.86/NEWS --- old/usbutils-0.84/NEWS 2009-06-25 19:08:35.000000000 +0200 +++ new/usbutils-0.86/NEWS 2009-08-18 00:29:42.000000000 +0200 @@ -1,3 +1,12 @@ +usbutils 0.86 +============= +HID device robust fix + +usbutils 0.85 +============= +usb-devices bugfixes +build fixes + usbutils 0.84 ============= Sync up usb.ids file from upstream diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/configure new/usbutils-0.86/configure --- old/usbutils-0.84/configure 2009-06-25 19:08:44.000000000 +0200 +++ new/usbutils-0.86/configure 2009-08-18 00:29:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for usbutils 0.84. +# Generated by GNU Autoconf 2.63 for usbutils 0.86. # # Report bugs to <linux-usb(a)vger.kernel.org>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='usbutils' PACKAGE_TARNAME='usbutils' -PACKAGE_VERSION='0.84' -PACKAGE_STRING='usbutils 0.84' +PACKAGE_VERSION='0.86' +PACKAGE_STRING='usbutils 0.86' PACKAGE_BUGREPORT='linux-usb(a)vger.kernel.org' ac_default_prefix=/usr @@ -1294,7 +1294,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 usbutils 0.84 to adapt to many kinds of systems. +\`configure' configures usbutils 0.86 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1360,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of usbutils 0.84:";; + short | recursive ) echo "Configuration of usbutils 0.86:";; esac cat <<\_ACEOF @@ -1453,7 +1453,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -usbutils configure 0.84 +usbutils configure 0.86 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1467,7 +1467,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by usbutils $as_me 0.84, which was +It was created by usbutils $as_me 0.86, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2184,7 +2184,7 @@ # Define the identity of the package. PACKAGE='usbutils' - VERSION='0.84' + VERSION='0.86' cat >>confdefs.h <<_ACEOF @@ -2328,6 +2328,7 @@ + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -5417,7 +5418,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by usbutils $as_me 0.84, which was +This file was extended by usbutils $as_me 0.86, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5480,7 +5481,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -usbutils config.status 0.84 +usbutils config.status 0.86 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/configure.ac new/usbutils-0.86/configure.ac --- old/usbutils-0.84/configure.ac 2009-06-25 19:07:47.000000000 +0200 +++ new/usbutils-0.86/configure.ac 2009-08-18 00:29:52.000000000 +0200 @@ -1,8 +1,9 @@ AC_INIT([usbutils], - [0.84], + [0.86], [linux-usb(a)vger.kernel.org]) AC_PREREQ(2.60) AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PREFIX_DEFAULT([/usr]) AC_USE_SYSTEM_EXTENSIONS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/lsusb.8.in new/usbutils-0.86/lsusb.8.in --- old/usbutils-0.84/lsusb.8.in 2009-05-07 00:08:25.000000000 +0200 +++ new/usbutils-0.86/lsusb.8.in 2009-06-25 23:21:48.000000000 +0200 @@ -1,4 +1,4 @@ -.TH lsusb 8 "25 January 2005" "usbutils-0.73" "Linux USB Utilities" +.TH lsusb 8 "6 May 2009" "usbutils-VERSION" "Linux USB Utilities" .IX lsusb .SH NAME lsusb \- list USB devices diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/lsusb.c new/usbutils-0.86/lsusb.c --- old/usbutils-0.84/lsusb.c 2009-06-24 01:06:06.000000000 +0200 +++ new/usbutils-0.86/lsusb.c 2009-08-18 00:28:42.000000000 +0200 @@ -2247,15 +2247,23 @@ continue; } if (usb_claim_interface(dev, interface->bInterfaceNumber) == 0) { - if ((n = usb_control_msg(dev, + int retries = 4; + n = 0; + while (n < len && retries--) + n = usb_control_msg(dev, USB_ENDPOINT_IN | USB_TYPE_STANDARD | USB_RECIP_INTERFACE, USB_REQ_GET_DESCRIPTOR, (USB_DT_REPORT << 8), interface->bInterfaceNumber, dbuf, len, - CTRL_TIMEOUT)) > 0) + CTRL_TIMEOUT); + + if (n > 0) { + if (n < len) + printf(" Warning: incomplete report descriptor\n"); dump_report_desc(dbuf, n); + } usb_release_interface(dev, interface->bInterfaceNumber); } else { /* recent Linuxes require claim() for RECIP_INTERFACE, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/usb-devices new/usbutils-0.86/usb-devices --- old/usbutils-0.84/usb-devices 2009-06-25 18:01:46.000000000 +0200 +++ new/usbutils-0.86/usb-devices 2009-08-18 00:20:58.000000000 +0200 @@ -24,14 +24,14 @@ "01") echo "audio" ;; "02") echo "commc" ;; "03") echo "HID " ;; - "05") echo "phys " ;; - "06") echo "image" ;; + "05") echo "PID " ;; + "06") echo "still" ;; "07") echo "print" ;; - "08") echo "mstor" ;; + "08") echo "stor." ;; "09") echo "hub " ;; - "0a") echo "comdt" ;; - "0b") echo "smcrd" ;; - "0d") echo "cosec" ;; + "0a") echo "data " ;; + "0b") echo "scard" ;; + "0d") echo "c-sec" ;; "0e") echo "video" ;; "0f") echo "perhc" ;; "dc") echo "diagd" ;; @@ -125,7 +125,7 @@ prodid=`cat idProduct` revmajor=`cat bcdDevice | cut -c 1-2` revminor=`cat bcdDevice | cut -c 3-4` - printf "P: Vendor=%s ProdID=%s Rev=%2i.%02i\n" \ + printf "P: Vendor=%s ProdID=%s Rev=%s.%s\n" \ $vendid $prodid $revmajor $revminor print_string manufacturer "Manufacturer" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/usb-devices.1.in new/usbutils-0.86/usb-devices.1.in --- old/usbutils-0.84/usb-devices.1.in 1970-01-01 01:00:00.000000000 +0100 +++ new/usbutils-0.86/usb-devices.1.in 2009-08-18 00:19:50.000000000 +0200 @@ -0,0 +1,51 @@ +.TH usb-devices 1 "23 June 2009" "usbutils-VERSION" "Linux USB Utilities" +.IX usb-devices +.SH NAME +usb-devices \- print USB device details +.SH SYNOPSIS +.B usb-devices + +.SH DESCRIPTION +.B usb-devices +is a (bash) shell script that can be used to display details of USB +buses in the system and the devices connected to them. + +The output of the script is similar to the \fIusb/devices\fP file +available either under \fI/proc/bus\fP (if usbfs is mounted), or under +\fI/sys/kernel/debug\fP (if debugfs is mounted there). The script is +primairily intended to be used if the file is not available. + +In contrast to the \fIusb/devices\fP file, this script only lists +\fIactive\fP interfaces (those marked with a "*" in the \fIusb/devices\fP +file) and their endpoints. + +Be advised that there can be differences in the way information is sorted, +as well as in the format of the output. + +.SH RETURN VALUE +If sysfs is not mounted, a non-zero exit code is returned. + +.SH FILES +.TP +.B /sys/bus/usb/devices/usb* +The part of the sysfs tree the script walks through to assemble the +printed information. +.TP +.B /proc/bus/usb/devices +Location where the \fIusb/devices\fP file can normally be found for +Linux kernels before 2.6.31, if usbfs is mounted. +.TP +.B /sys/kernel/debug/usb/devices +Location where the \fIusb/devices\fP file can normally be found for +Linux kernel 2.6.31 and later, if debugfs is mounted. + +.SH SEE ALSO +.BR lsusb (8), +.BR usbview (8). + +.SH AUTHORS +Greg Kroah-Hartman <greg(a)kroah.com> +.P +Randy Dunlap <rdunlap(a)xenotime.net> +.P +Frans Pop <elendil(a)planet.nl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/usb-devices.8.in new/usbutils-0.86/usb-devices.8.in --- old/usbutils-0.84/usb-devices.8.in 2009-06-25 18:13:22.000000000 +0200 +++ new/usbutils-0.86/usb-devices.8.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -.TH usb-devices 8 "23 June 2009" "usbutils-VERSION" "Linux USB Utilities" -.IX usb-devices -.SH NAME -usb-devices \- print USB device details -.SH SYNOPSIS -.B usb-devices - -.SH DESCRIPTION -.B usb-devices -is a (bash) shell script that can be used to display details of USB -buses in the system and the devices connected to them. - -The output of the script is similar to the \fIusb/devices\fP file -available either under \fI/proc/bus\fP (if usbfs is mounted), or under -\fI/sys/kernel/debug\fP (if debugfs is mounted there). The script is -primairily intended to be used if the file is not available. - -In contrast to the \fIusb/devices\fP file, this script only lists -\fIactive\fP interfaces (those marked with a "*" in the \fIusb/devices\fP -file) and their endpoints. - -Be advised that there can be differences in the way information is sorted, -as well as in the format of the output. - -.SH RETURN VALUE -If sysfs is not mounted, a non-zero exit code is returned. - -.SH FILES -.TP -.B /sys/bus/usb/devices/usb* -The part of the sysfs tree the script walks through to assemble the -printed information. -.TP -.B /proc/bus/usb/devices -Location where the \fIusb/devices\fP file can normally be found for -Linux kernels before 2.6.31, if usbfs is mounted. -.TP -.B /sys/kernel/debug/usb/devices -Location where the \fIusb/devices\fP file can normally be found for -Linux kernel 2.6.31 and later, if debugfs is mounted. - -.SH SEE ALSO -.BR lsusb (8), -.BR usbview (8). - -.SH AUTHORS -Greg Kroah-Hartman <greg(a)kroah.com> -.P -Randy Dunlap <rdunlap(a)xenotime.net> -.P -Frans Pop <elendil(a)planet.nl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/usb.ids new/usbutils-0.86/usb.ids --- old/usbutils-0.84/usb.ids 2009-06-25 19:03:12.000000000 +0200 +++ new/usbutils-0.86/usb.ids 2009-06-26 00:41:25.000000000 +0200 @@ -22,11 +22,11 @@ 0003 Club Mac 0004 Nebraska Furniture Mart 0053 Planex - 5301 GW-US54ZGL 802.11bg (zd1211rw) + 5301 GW-US54ZGL 802.11bg 0079 DragonRise Inc. 0006 Generic USB Joystick 0105 Unknown - 145f 802.11bg (zd1211rw) + 145f 802.11bg 0145 Unknown 0112 Card Reader 0204 Chipsbank Microelectronics Co., Ltd @@ -856,7 +856,7 @@ 00cb WLI-U2-G300N 802.11n Adapter 00d8 WLI-U2-SG54HP 00d9 WLI-U2-G54HP - 00da WLI-U2-KG54L 802.11bg (zd1211rw) + 00da WLI-U2-KG54L 802.11bg 0412 Award Software International 0413 Leadtek Research, Inc. 1310 WinFast TV - NTSC + FM @@ -2165,8 +2165,8 @@ 1230 Wireless Adapter 11g 1232 SNU6500 Wireless Adapter 1233 Wireless Adapter Bootloader Download - 1236 SNU5600 802.11bg (zd1211rw) - 1237 TalkTalk SNU5630NS/05 802.11bg (zd1211rw) + 1236 SNU5600 802.11bg + 1237 TalkTalk SNU5630NS/05 802.11bg 1552 ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit 1801 Diva MP3 player 200a Wireless Network Adapter @@ -3216,7 +3216,7 @@ 0930 ETG-US2 0937 WN-WAG/USL Wireless LAN Adapter 0938 WN-G54/USL Wireless LAN Adapter - 093f WNGDNUS2 802.11n (ar9170) + 093f WNGDNUS2 802.11n 0a03 Serial USB-RSAQ1 0a07 USB2-iCN Adapter 0a08 USB2-iCN Adapter @@ -4057,12 +4057,12 @@ 3201 F1DF102U/F1DG102U Flip KVM 4050 ZD1211B 5055 F5D5055 - 6051 802.11b (zd1201) + 6051 802.11b 7050 F5D7050 ver 1000 WiFi 7051 F5D7051 54g USB Network Adapter 705a F5D7050A Wireless Adapter 705b Wireless G Adapter - 705c 802.11bg (zd1211rw) + 705c 802.11bg 905b F5D9050 ver 3 Wireless Adapter 905c Wireless G Plus MIMO Network Adapter 050e Neon Technology, Inc. @@ -4841,16 +4841,16 @@ 3304 LAN Modem 330a ADSL Modem Interface 330e USB Broadband ADSL Modem Rev 1.10 - 3400 802.11b (zd1201) - 3401 ZyAIR G-220 802.11bg (zd1211rw) - 3402 ZyAIR G-220F 802.11bg (zd1211rw) - 3407 G-200 v2 802.11bg (zd1211rw) - 3409 AG-225H 802.11bg (zd1211rw) - 340a M-202 802.11bg (zd1211rw) - 340f G-220 v2 802.11bg (zd1211rw) - 3410 ZyAIR G-202 802.11bg (zd1211rw) - 3412 802.11bg (zd1211rw) - 3413 ZyAIR AG-225H v2 802.11bg (zd1211rw) + 3400 802.11b + 3401 ZyAIR G-220 802.11bg + 3402 ZyAIR G-220F 802.11bg + 3407 G-200 v2 802.11bg + 3409 AG-225H 802.11bg + 340a M-202 802.11bg + 340f G-220 v2 802.11bg + 3410 ZyAIR G-202 802.11bg + 3412 802.11bg + 3413 ZyAIR AG-225H v2 802.11bg 3415 G-210H 802.11g Wireless Adapter 3416 NWD-210N 802.11b/g/n-draft wireless adapter 0587 America Kotobuki Electronics Industries, Inc. @@ -6783,13 +6783,13 @@ 0030 Mobile Communication Device 0042 Mobile # 2 Mobile Video Pseudo CDC Trace - 004a XG-760A 802.11bg (zd1211rw) + 004a XG-760A 802.11bg 004b Wi-Fi 11g adapter 0056 Agfa AP1100 Photo Printer 005d Mobile Mass Storage # 1 Mobile Mass Storage Pseudo CDC Trace # 2 Mobile Mass Storage Pseudo CDC Chimera - 0062 XG-76NA 802.11bg (zd1211rw) + 0062 XG-76NA 802.11bg 079d Alfadata Computer Corp. 0201 GamePort Adapter 07a1 Digicom S.p.A. @@ -6908,8 +6908,8 @@ 4102 USB 1.1 10/100M Fast Ethernet Adapter 4104 XX9 420a UF200 Ethernet - 6001 802.11bg (zd1211rw) - 5301 GW-US54ZGL 802.11bg (zd1211rw) + 6001 802.11bg + 5301 GW-US54ZGL 802.11bg a001 Wireless Network Adapter abc1 DU-E10 Ethernet [pegasus] b000 BWU613 @@ -7101,7 +7101,7 @@ 3b01 AirPlus G DWL-G122 Wireless Adapter 3b10 RangeBooster N Adapter 3b11 Wireless N Adapter DWA-130 - 3c10 DWA 160A 802.11n (ar9170) + 3c10 DWA 160A 802.11n 3c03 DWL-G122 802.11g Adapter [ralink rt73] 3c04 WUA-1340 3c05 EH103 Wireless G Adapter @@ -7145,7 +7145,7 @@ 07fa Draytek 0778 miniVigor 128 ISDN TA 1012 BeWAN ADSL USB ST (grey) - 1196 BWIFI-USB54AR 802.11bg (zd1211rw) + 1196 BWIFI-USB54AR 802.11bg a904 BeWAN ADSL a905 BeWAN ADSL ST 07fd Mark of the Unicorn @@ -7275,7 +7275,7 @@ 3502 WN3501D Wireless Adapter 3503 T-Sinus 111 Wireless Adapter 4501 T-Sinus 154data - 4505 SMCWUSB-G 802.11bg (zd1211rw) + 4505 SMCWUSB-G 802.11bg 5046 SpeedStream 10/100 Ethernet [pegasus] 5501 Wireless Adapter 11g 6500 Cable Modem @@ -7289,10 +7289,10 @@ c501 Zoom Wireless-G c561 802.11a/g Wireless Adapter e501 ZD1211B - e506 WUS-201 802.11bg (zd1211rw) + e506 WUS-201 802.11bg f501 802.11g Wireless Adapter f502 802.11g Wireless Adapter - f522 Arcadyan WN7512 802.11n (ar9170) + f522 Arcadyan WN7512 802.11n 083f Global Village b100 TelePort V.90 Fax/Modem 0840 Argosy Research, Inc. @@ -7317,8 +7317,8 @@ 6a00 WG111v2 54 Mbps Wireless [RealTek RTL8187L] 7100 WN121T RangeMax Next Wireless-N [Marvell TopDog] 9000 WN111(v1) RangeMax Next Wireless [Marvell TopDog] - 9001 WN111 v2 802.11n (ar9170) - 9010 WNDA3100 802.11n (ar9170) + 9001 WN111 v2 802.11n + 9010 WNDA3100 802.11n a001 PA101 10 Mbps HPNA Home Phoneline RJ-1 084d Minton Optic Industry Co., Inc. 0001 Jenoptik JD800i @@ -8395,16 +8395,16 @@ 0acd ID Tech 0401 ID TECH Spectrum III Hybrid Smartcard Reader 0ace ZyDAS - 1201 802.11b (zd1201) - 1211 802.11bg (zd1211rw) - 1215 WLA-54L 802.11bg (zd1211rw) - 1221 ZD1221 802.11n (ar9170) + 1201 802.11b + 1211 802.11bg + 1215 WLA-54L 802.11bg + 1221 ZD1221 802.11n 1602 ZyXEL Omni FaxModem 56K 1608 ZyXEL Omni FaxModem 56K UNO 1611 ZyXEL Omni FaxModem 56K Plus - 2011 Virtual media for 802.11bg (zd1211rw) - 20ff Virtual media for 802.11bg (zd1211rw) - b215 802.11bg (zd1211rw) + 2011 Virtual media for 802.11bg + 20ff Virtual media for 802.11bg + b215 802.11bg 0acf Intoto, Inc. 0ad0 Intellix Corp. 0ad1 Remotec Technology, Ltd @@ -8462,12 +8462,12 @@ 1707 WL-167g Wireless Adapter 1708 Mass Storage Device 170b Mass Storage Device - 170c WL-159g 802.11bg (zd1211rw) + 170c WL-159g 802.11bg 170d 802.11b/g Wireless Network Adapter 1712 BT-183 Bluetooth 2.0+EDR adapter 1715 2045 Bluetooth 2.0 Device with trace filter 1716 Bluetooth Device - 171b A9T wireless 802.11bg (zd1211rw) + 171b A9T wireless 802.11bg 171c 802.11b/g Wireless Network Adapter 1723 WL-167G v2 802.11g Adapter [ralink] 1724 RT2573 @@ -8517,8 +8517,8 @@ 1612 AIR.Mate 2@net 802.11b Adapter 1613 802.11b Wireless LAN Adapter 1620 Allnet USB 2.0 Wireless Network Adapter - 1630 QuickWLAN 802.11bg (zd1211rw) - 5630 802.11bg (zd1211rw) + 1630 QuickWLAN 802.11bg + 5630 802.11bg 6630 ZD1211 0b3c Olivetti Techcenter a010 Simple_Way Printer/Scanner/Copier @@ -8626,7 +8626,7 @@ 00fb SureConnect ADSL Ethernet/USB Router 0118 U5 802.11g Adapter 011b Wireless MAXg Adapter - 0121 USR5423 802.11bg (zd1211rw) + 0121 USR5423 802.11bg 6112 FaxModem Model 5633 0bb0 Concord Camera Corp. 0100 Sound Vision Stream @@ -9256,12 +9256,12 @@ 0015 Zoom Wireless-G 0016 NB 802.11g Wireless LAN Adapter(3887A) 0018 NB 802.11a/b/g Wireless LAN Adapter(3887A) - 001a 802.11bg (zd1211rw) + 001a 802.11bg 001c 802.11b/g Wireless Network Adapter 0020 Wi-Fi Wireless LAN Adapter 0022 802.11b/g/n Wireless Network Adapter - 0023 UB81 802.11bgn (ar9170) - 0026 UB82 802.11abgn (ar9170) + 0023 UB81 802.11bgn + 0026 UB82 802.11abgn 0ce9 pico Technology 1001 PicoScope3204 0cf1 e-Conn Electronic Co., Ltd @@ -9274,7 +9274,7 @@ 0005 AR5523 0006 AR5523 (no firmware) 9170 AR9170 802.11n - 1001 TG121N (ar9170) + 1001 TG121N 0cf4 Fomtex Corp. 0cf5 Cellink Co., Ltd 0cf6 Compucable Corp. @@ -9539,7 +9539,7 @@ 5515 MP3 Player 5516 MP3 Player 5581 Mega Sky 5580 DVB-T Tuner - 6823 802.11b (zd1201) + 6823 802.11b 6826 IEEE 802.11g Wireless Network Adapter 6855 Bluetooth Device 6861 MSI-6861 802.11g WiFi adapter @@ -9657,8 +9657,8 @@ 2200 Sitecom bluetooth2.0 class 2 dongle CN-512 2208 Sitecom bluetooth2.0 class 2 dongle CN-520 2209 Sitecom bluetooth2.0 class 1 dongle CN-521 - 9071 802.11bg (zd1211rw) - 9075 802.11bg (zd1211rw) + 9071 802.11bg + 9075 802.11bg 90ac WL-172 9712 WL-113 rev 2 0df7 Mobile Action Technology, Inc. @@ -10094,7 +10094,7 @@ 8002 GN-BR402W 8003 GN-WLBM101 8004 GN-WLBZ101 802.11b Adapter - 8005 802.11b (zd1201) + 8005 802.11b 8006 GN-WBZB-M 802.11b Adapter 8007 GN-WBKG 8008 GN-WB01GS @@ -10498,7 +10498,7 @@ 126f TwinMOS 1325 Mobile Disk 2168 Mobile Disk III - a006 G240 802.11bg (zd1211rw) + a006 G240 802.11bg 1275 Xaxero Marine Software Engineering, Ltd. 0002 WeatherFax 2000 Demodulator 0080 SkyEye Weather Satellite Receiver @@ -10511,8 +10511,8 @@ 2101 104-key keyboard 1294 RISO KAGAKU CORP. 129b CyberTAN Technology - 1666 TG54USB 802.11bg (zd1211rw) - 1667 802.11bg (zd1211rw) + 1666 TG54USB 802.11bg + 1667 802.11bg 12a7 Trendchip Technologies Corp. 12ab Honey Bee Electronic International Ltd. 12ba Licensed by Sony Computer Entertainment America @@ -10611,10 +10611,10 @@ 0011 WUSB54GP v4.0 802.11g Adapter 0018 USB200M 10/100 Ethernet Adapter 001a HU200TS Wireless Adapter - 001e WUSBF54G 802.11bg (zd1211rw) + 001e WUSBF54G 802.11bg 0020 WUSB54GC 802.11g Adapter [ralink rt73] 0023 WUSB54GR - 0024 WUSBF54G v1.1 802.11bg (zd1211rw) + 0024 WUSBF54G v1.1 802.11bg 13b3 Nippon Dics Co., Ltd. 13ba Unknown 0017 PS/2 Keyboard+Mouse Adapter @@ -10693,7 +10693,7 @@ 1430 RedOctane 1431 Pertech Resources, Inc. 1435 Wistron NeWeb - 0711 UR055G 802.11bg (zd1211rw) + 0711 UR055G 802.11bg 0826 AR5523 0827 AR5523 (no firmware) 0828 AR5523 @@ -10775,7 +10775,7 @@ 14ea Planex Communications ab10 GW-US54GZ ab11 GU-1000T - ab13 GW-US54Mini 802.11bg (zd1211rw) + ab13 GW-US54Mini 802.11bg 14ed Shure Inc. 1500 Ellisys 1501 Pine-Tum Enterprise Co., Ltd. @@ -10826,14 +10826,14 @@ 157e TRENDnet 3006 TEW-444UB EU 3007 TEW-444UB EU (no firmware) - 300a TEW-429UB 802.11bg (zd1211rw) - 300b TEW-429UB 802.11bg (zd1211rw) - 300d TEW-429UB C1 802.11bg (zd1211rw) - 3204 ALL0298 v2 802.11bg (zd1211rw) + 300a TEW-429UB 802.11bg + 300b TEW-429UB 802.11bg + 300d TEW-429UB C1 802.11bg + 3204 ALL0298 v2 802.11bg 3205 AR5523 3206 AR5523 (no firmware) 1582 Fiberline - 6003 WL-430U 802.11bg (zd1211rw) + 6003 WL-430U 802.11bg 1587 SMA Technologie AG 158d Oakley Inc. 1598 Kunshan Guoji Electronics Co., Ltd. @@ -11128,7 +11128,7 @@ 1737 Linksys 0039 USB1000 1740 Senao - 2000 NUB-8301 802.11bg (zd1211rw) + 2000 NUB-8301 802.11bg 1743 General Atomics 174c ASMedia Technology Inc. 174f Syntek @@ -11595,8 +11595,8 @@ f118 Formosa 4 2019 PLANEX 3220 GW-US11S WLAN - 5303 GW-US54GXS 802.11bg (zd1211rw) - 5304 GWUS300 802.11n (ar9170) + 5303 GW-US54GXS 802.11bg + 5304 GWUS300 802.11n ab01 GW-US54HP ab50 GW-US54Mini2 c002 GW-US54SG @@ -12051,7 +12051,7 @@ 2667 JCOP BlueZ Smartcard reader 8804 WiseGroup SuperJoy Box 5 6891 3Com - a727 3CRUSB10075 802.11bg (zd1211rw) + a727 3CRUSB10075 802.11bg 6993 Freshtel b001 FT-102 VoIP USB Phone 6a75 Shanghai Jujo Electronics Co., Ltd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libdrm for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at Fri Oct 1 23:56:31 CEST 2010. -------- --- libdrm/libdrm.changes 2010-09-15 06:15:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/libdrm/libdrm.changes 2010-09-29 14:44:04.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 29 12:34:42 UTC 2010 - sndirsch(a)novell.com + +- libdrm 2.4.22 + * nouveau: fix thinko in drm version check + * nouveau: fix drm version check some more + * intel: Replace open-coded drmIoctl with calls to drmIoctl() + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libdrm-2.4.21-7ec9a1e.tar.bz2 New: ---- libdrm-2.4.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.0YXeBX/_old 2010-10-01 23:55:28.000000000 +0200 +++ /var/tmp/diff_new_pack.0YXeBX/_new 2010-10-01 23:55:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libdrm (Version 2.4.21) +# spec file for package libdrm (Version 2.4.22) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ License: MIT License (or similar) Group: System/Libraries AutoReqProv: on -Version: 2.4.21 -Release: 6 +Version: 2.4.22 +Release: 1 Provides: libdrm23 = %{version} Obsoletes: libdrm23 < %{version} # bug437293 @@ -35,7 +35,7 @@ %endif # Summary: Userspace Interface for Kernel DRM Services -Source: %{name}-%{version}-7ec9a1e.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf Patch: enable_test_tools.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libdrm-2.4.21-7ec9a1e.tar.bz2 -> libdrm-2.4.22.tar.bz2 ++++++ ++++ 3505 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdrm-2.4.21/configure.ac new/libdrm-2.4.22/configure.ac --- old/libdrm-2.4.21/configure.ac 2010-06-15 12:01:09.000000000 +0200 +++ new/libdrm-2.4.22/configure.ac 2010-09-29 05:38:46.000000000 +0200 @@ -19,7 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AC_PREREQ(2.60) -AC_INIT([libdrm], 2.4.21, [dri-devel(a)lists.sourceforge.net], libdrm) +AC_INIT([libdrm], 2.4.22, [dri-devel(a)lists.sourceforge.net], libdrm) AC_USE_SYSTEM_EXTENSIONS AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdrm-2.4.21/include/drm/Makefile new/libdrm-2.4.22/include/drm/Makefile --- old/libdrm-2.4.21/include/drm/Makefile 2010-09-15 06:00:10.000000000 +0200 +++ new/libdrm-2.4.22/include/drm/Makefile 2010-09-29 05:39:14.000000000 +0200 @@ -56,8 +56,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-suse-linux-gnu -host_triplet = x86_64-suse-linux-gnu +build_triplet = x86_64-unknown-linux-gnu +host_triplet = x86_64-unknown-linux-gnu #am__append_1 = vmwgfx_drm.h subdir = include/drm DIST_COMMON = $(am__klibdrminclude_HEADERS_DIST) $(srcdir)/Makefile.am \ @@ -107,17 +107,17 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run aclocal-1.11 +ACLOCAL = aclocal -I /opt/xorg/share/aclocal ALLOCA = -AMTAR = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run tar +AMTAR = ${SHELL} /home/cworth/src/xorg/drm/missing --run tar AM_DEFAULT_VERBOSITY = 0 AR = ar -AUTOCONF = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run autoconf -AUTOHEADER = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run autoheader -AUTOMAKE = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run automake-1.11 +AUTOCONF = ${SHELL} /home/cworth/src/xorg/drm/missing --run autoconf +AUTOHEADER = ${SHELL} /home/cworth/src/xorg/drm/missing --run autoheader +AUTOMAKE = ${SHELL} /home/cworth/src/xorg/drm/missing --run automake-1.11 AWK = gawk -CAIRO_CFLAGS = -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -CAIRO_LIBS = -lcairo +CAIRO_CFLAGS = -pthread -I/opt/xorg/include/cairo -I/opt/xorg/include/pixman-1 -I/opt/xorg/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 +CAIRO_LIBS = -L/opt/xorg/lib -lcairo CC = gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 @@ -132,26 +132,26 @@ ECHO_C = ECHO_N = -n ECHO_T = -EGREP = /usr/bin/grep -E +EGREP = /bin/grep -E EXEEXT = -FGREP = /usr/bin/grep -F -GREP = /usr/bin/grep -INSTALL = /usr/bin/install -c +FGREP = /bin/grep -F +GREP = /bin/grep +INSTALL = /usr/bin/install -C INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -LD = /usr/x86_64-suse-linux/bin/ld -m elf_x86_64 +LD = /usr/bin/ld -m elf_i386 LDFLAGS = LIBOBJS = LIBS = LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIBUDEV_CFLAGS = -LIBUDEV_LIBS = +LIBUDEV_CFLAGS = +LIBUDEV_LIBS = -ludev LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run makeinfo +MAKEINFO = ${SHELL} /home/cworth/src/xorg/drm/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -162,27 +162,27 @@ PACKAGE = libdrm PACKAGE_BUGREPORT = dri-devel(a)lists.sourceforge.net PACKAGE_NAME = libdrm -PACKAGE_STRING = libdrm 2.4.21 +PACKAGE_STRING = libdrm 2.4.22 PACKAGE_TARNAME = libdrm PACKAGE_URL = -PACKAGE_VERSION = 2.4.21 +PACKAGE_VERSION = 2.4.22 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = -PKG_CONFIG_PATH = +PKG_CONFIG_PATH = /opt/xorg/lib/pkgconfig PTHREADSTUBS_CFLAGS = PTHREADSTUBS_LIBS = RANLIB = ranlib -SED = /usr/bin/sed +SED = /bin/sed SET_MAKE = -SHELL = /bin/sh +SHELL = /bin/bash STRIP = strip -VERSION = 2.4.21 +VERSION = 2.4.22 WARN_CFLAGS = -Wall -Wextra -Wsign-compare -Werror-implicit-function-declaration -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked -Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations -Wdeclaration-after-statement -Wold-style-definition -Wno-missing-field-initializers -Wno-unused-parameter -Wno-attributes -Wno-long-long -Winline -abs_builddir = /suse/sndirsch/projects/drm/drm/include/drm -abs_srcdir = /suse/sndirsch/projects/drm/drm/include/drm -abs_top_builddir = /suse/sndirsch/projects/drm/drm -abs_top_srcdir = /suse/sndirsch/projects/drm/drm +abs_builddir = /home/cworth/src/xorg/drm/include/drm +abs_srcdir = /home/cworth/src/xorg/drm/include/drm +abs_top_builddir = /home/cworth/src/xorg/drm +abs_top_srcdir = /home/cworth/src/xorg/drm ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -191,26 +191,26 @@ am__tar = ${AMTAR} chof - "$$tardir" am__untar = ${AMTAR} xf - bindir = ${exec_prefix}/bin -build = x86_64-suse-linux-gnu +build = x86_64-unknown-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = suse +build_vendor = unknown builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-suse-linux-gnu +host = x86_64-unknown-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = suse +host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /suse/sndirsch/projects/drm/drm/install-sh +install_sh = ${SHELL} /home/cworth/src/xorg/drm/install-sh kernel_source = libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec @@ -222,7 +222,7 @@ oldincludedir = /usr/include pdfdir = ${docdir} pkgconfigdir = ${exec_prefix}/lib/pkgconfig -prefix = /usr/local +prefix = /opt/xorg program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdrm-2.4.21/intel/intel_bufmgr_gem.c new/libdrm-2.4.22/intel/intel_bufmgr_gem.c --- old/libdrm-2.4.21/intel/intel_bufmgr_gem.c 2010-08-27 11:19:16.000000000 +0200 +++ new/libdrm-2.4.22/intel/intel_bufmgr_gem.c 2010-09-29 05:37:17.000000000 +0200 @@ -507,9 +507,7 @@ memset(&busy, 0, sizeof(busy)); busy.handle = bo_gem->gem_handle; - do { - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_BUSY, &busy); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_BUSY, &busy); return (ret == 0 && busy.busy); } @@ -523,7 +521,7 @@ madv.handle = bo_gem->gem_handle; madv.madv = state; madv.retained = 1; - ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv); + drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv); return madv.retained; } @@ -650,11 +648,9 @@ memset(&create, 0, sizeof(create)); create.size = bo_size; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_CREATE, - &create); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_CREATE, + &create); bo_gem->gem_handle = create.handle; bo_gem->bo.handle = bo_gem->gem_handle; if (ret != 0) { @@ -782,11 +778,9 @@ memset(&open_arg, 0, sizeof(open_arg)); open_arg.name = handle; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_GEM_OPEN, - &open_arg); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_GEM_OPEN, + &open_arg); if (ret != 0) { fprintf(stderr, "Couldn't reference %s handle 0x%08x: %s\n", name, handle, strerror(errno)); @@ -806,7 +800,9 @@ memset(&get_tiling, 0, sizeof(get_tiling)); get_tiling.handle = bo_gem->gem_handle; - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_GET_TILING, &get_tiling); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_GET_TILING, + &get_tiling); if (ret != 0) { drm_intel_gem_bo_unreference(&bo_gem->bo); return NULL; @@ -837,7 +833,7 @@ /* Close this object */ memset(&close, 0, sizeof(close)); close.handle = bo_gem->gem_handle; - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_GEM_CLOSE, &close); + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_GEM_CLOSE, &close); if (ret != 0) { fprintf(stderr, "DRM_IOCTL_GEM_CLOSE %d failed (%s): %s\n", @@ -974,11 +970,9 @@ mmap_arg.handle = bo_gem->gem_handle; mmap_arg.offset = 0; mmap_arg.size = bo->size; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_MMAP, - &mmap_arg); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_MMAP, + &mmap_arg); if (ret != 0) { ret = -errno; fprintf(stderr, @@ -1000,11 +994,9 @@ set_domain.write_domain = I915_GEM_DOMAIN_CPU; else set_domain.write_domain = 0; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_SET_DOMAIN, - &set_domain); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_SET_DOMAIN, + &set_domain); if (ret != 0) { fprintf(stderr, "%s:%d: Error setting to CPU domain %d: %s\n", __FILE__, __LINE__, bo_gem->gem_handle, @@ -1036,11 +1028,9 @@ mmap_arg.handle = bo_gem->gem_handle; /* Get the fake offset back... */ - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_MMAP_GTT, - &mmap_arg); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_MMAP_GTT, + &mmap_arg); if (ret != 0) { ret = -errno; fprintf(stderr, @@ -1078,11 +1068,9 @@ set_domain.handle = bo_gem->gem_handle; set_domain.read_domains = I915_GEM_DOMAIN_GTT; set_domain.write_domain = I915_GEM_DOMAIN_GTT; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_SET_DOMAIN, - &set_domain); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_SET_DOMAIN, + &set_domain); if (ret != 0) { fprintf(stderr, "%s:%d: Error setting domain %d: %s\n", __FILE__, __LINE__, bo_gem->gem_handle, @@ -1130,11 +1118,9 @@ * results show up in a timely manner. */ sw_finish.handle = bo_gem->gem_handle; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_SW_FINISH, - &sw_finish); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_SW_FINISH, + &sw_finish); ret = ret == -1 ? -errno : 0; bo->virtual = NULL; @@ -1157,11 +1143,9 @@ pwrite.offset = offset; pwrite.size = size; pwrite.data_ptr = (uint64_t) (uintptr_t) data; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_PWRITE, - &pwrite); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_PWRITE, + &pwrite); if (ret != 0) { ret = -errno; fprintf(stderr, @@ -1181,8 +1165,9 @@ int ret; get_pipe_from_crtc_id.crtc_id = crtc_id; - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID, - &get_pipe_from_crtc_id); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID, + &get_pipe_from_crtc_id); if (ret != 0) { /* We return -1 here to signal that we don't * know which pipe is associated with this crtc. @@ -1210,11 +1195,9 @@ pread.offset = offset; pread.size = size; pread.data_ptr = (uint64_t) (uintptr_t) data; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_PREAD, - &pread); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_PREAD, + &pread); if (ret != 0) { ret = -errno; fprintf(stderr, @@ -1251,11 +1234,9 @@ set_domain.handle = bo_gem->gem_handle; set_domain.read_domains = I915_GEM_DOMAIN_GTT; set_domain.write_domain = write_enable ? I915_GEM_DOMAIN_GTT : 0; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_SET_DOMAIN, - &set_domain); - } while (ret == -1 && errno == EINTR); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_SET_DOMAIN, + &set_domain); if (ret != 0) { fprintf(stderr, "%s:%d: Error setting memory domains %d (%08x %08x): %s .\n", @@ -1526,12 +1507,9 @@ execbuf.DR1 = 0; execbuf.DR4 = DR4; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_EXECBUFFER, - &execbuf); - } while (ret != 0 && errno == EINTR); - + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_EXECBUFFER, + &execbuf); if (ret != 0) { ret = -errno; if (errno == ENOSPC) { @@ -1599,11 +1577,9 @@ execbuf.rsvd1 = 0; execbuf.rsvd2 = 0; - do { - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, - &execbuf); - } while (ret != 0 && errno == EINTR); - + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_EXECBUFFER2, + &execbuf); if (ret != 0) { ret = -errno; if (ret == -ENOSPC) { @@ -1658,12 +1634,9 @@ pin.handle = bo_gem->gem_handle; pin.alignment = alignment; - do { - ret = ioctl(bufmgr_gem->fd, - DRM_IOCTL_I915_GEM_PIN, - &pin); - } while (ret == -1 && errno == EINTR); - + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_PIN, + &pin); if (ret != 0) return -errno; @@ -1682,7 +1655,7 @@ memset(&unpin, 0, sizeof(unpin)); unpin.handle = bo_gem->gem_handle; - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_UNPIN, &unpin); + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_UNPIN, &unpin); if (ret != 0) return -errno; @@ -1706,6 +1679,10 @@ memset(&set_tiling, 0, sizeof(set_tiling)); do { + /* set_tiling is slightly broken and overwrites the + * input on the error path, so we have to open code + * rmIoctl. + */ set_tiling.handle = bo_gem->gem_handle; set_tiling.tiling_mode = tiling_mode; set_tiling.stride = stride; @@ -1713,7 +1690,7 @@ ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling); - } while (ret == -1 && errno == EINTR); + } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); if (ret == -1) return -errno; @@ -1768,7 +1745,7 @@ memset(&flink, 0, sizeof(flink)); flink.handle = bo_gem->gem_handle; - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_GEM_FLINK, &flink); + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_GEM_FLINK, &flink); if (ret != 0) return -errno; bo_gem->global_name = flink.name; @@ -2099,7 +2076,9 @@ return NULL; } - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture); + ret = drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_GET_APERTURE, + &aperture); if (ret == 0) bufmgr_gem->gtt_size = aperture.aper_available_size; @@ -2115,7 +2094,7 @@ gp.param = I915_PARAM_CHIPSET_ID; gp.value = &bufmgr_gem->pci_device; - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp); + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp); if (ret) { fprintf(stderr, "get chip id failed: %d [%d]\n", ret, errno); fprintf(stderr, "param: %d, val: %d\n", gp.param, *gp.value); @@ -2131,19 +2110,19 @@ bufmgr_gem->gen = 6; gp.param = I915_PARAM_HAS_EXECBUF2; - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp); + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp); if (!ret) exec2 = 1; gp.param = I915_PARAM_HAS_BSD; - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp); + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp); if (!ret) has_bsd = 1; if (bufmgr_gem->gen < 4) { gp.param = I915_PARAM_NUM_FENCES_AVAIL; gp.value = &bufmgr_gem->available_fences; - ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp); + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp); if (ret) { fprintf(stderr, "get fences failed: %d [%d]\n", ret, errno); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdrm-2.4.21/missing new/libdrm-2.4.22/missing --- old/libdrm-2.4.21/missing 2010-06-24 16:46:31.000000000 +0200 +++ new/libdrm-2.4.22/missing 2008-06-27 23:33:27.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,9 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,9 +89,6 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -107,22 +106,15 @@ esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. +# the program). case $1 in - lex*|yacc*) + lex|yacc) # Not GNU programs, they don't have --version. ;; - tar*) + tar) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -146,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $program in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -156,7 +148,7 @@ touch aclocal.m4 ;; - autoconf*) + autoconf) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -165,7 +157,7 @@ touch configure ;; - autoheader*) + autoheader) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -195,7 +187,7 @@ while read f; do touch "$f"; done ;; - autom4te*) + autom4te) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -218,7 +210,7 @@ fi ;; - bison*|yacc*) + bison|yacc) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -248,7 +240,7 @@ fi ;; - lex*|flex*) + lex|flex) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -271,7 +263,7 @@ fi ;; - help2man*) + help2man) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -285,11 +277,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit $? + exit 1 fi ;; - makeinfo*) + makeinfo) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -318,7 +310,7 @@ touch $file ;; - tar*) + tar) shift # We have already tried tar in the generic part. @@ -371,6 +363,5 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdrm-2.4.21/nouveau/nouveau_device.c new/libdrm-2.4.22/nouveau/nouveau_device.c --- old/libdrm-2.4.21/nouveau/nouveau_device.c 2010-08-27 11:19:16.000000000 +0200 +++ new/libdrm-2.4.22/nouveau/nouveau_device.c 2010-09-29 05:37:17.000000000 +0200 @@ -49,8 +49,8 @@ if (!ver) return -EINVAL; - if ((ver->version_major == 0 && ver->version_patchlevel != 16) && - ver->version_major != 1) { + if ((ver->version_major == 0 && ver->version_patchlevel != 16) || + ver->version_major > 1) { nouveau_device_close((void *)&nvdev); return -EINVAL; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libpng14 for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package libpng14 for openSUSE:Factory checked in at Fri Oct 1 23:55:18 CEST 2010. -------- --- libpng14/libpng14.changes 2010-08-30 16:22:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/libpng14/libpng14.changes 2010-09-30 11:55:28.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Sep 30 09:51:05 UTC 2010 - pgajdos(a)novell.com + +- updated to 1.4.4: + * Eliminated another deprecated reference to png_ptr->io_ptr in pngtest.c + * Updated the xcode project to work with libpng-1.4.x and added iOS targets + for simulator and device (Philippe Hausler). + * Eliminated a deprecated reference to png_ptr->io_ptr in pngtest.c + * Removed unused png_mem_* defines from pngconf.h. + * Updated the read macros and functions from 1.5.0beta38. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libpng-1.4.3.tar.bz2 New: ---- libpng-1.4.4.tar.bz2 libpng14-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpng14.spec ++++++ --- /var/tmp/diff_new_pack.R8Ot5y/_old 2010-10-01 23:54:44.000000000 +0200 +++ /var/tmp/diff_new_pack.R8Ot5y/_new 2010-10-01 23:54:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libpng14 (Version 1.4.3) +# spec file for package libpng14 (Version 1.4.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ %define major 1 %define minor 4 -%define micro 3 +%define micro 4 %define branch %{major}%{minor} %define libname libpng%{branch}-%{branch} @@ -28,10 +28,11 @@ Group: System/Libraries Url: http://www.libpng.org/pub/png/libpng.html Version: %{major}.%{minor}.%{micro} -Release: 6 +Release: 1 Summary: Library for the Portable Network Graphics Format (PNG) Source: libpng-%{version}.tar.bz2 Source2: baselibs.conf +Patch0: %{name}-build.patch BuildRequires: pkg-config zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires %{libname} = %{version}-%{release} @@ -95,6 +96,7 @@ %prep %setup -n libpng-%{version} +%patch0 -p1 %build ./autogen.sh ++++++ libpng-1.4.3.tar.bz2 -> libpng-1.4.4.tar.bz2 ++++++ ++++ 21583 lines of diff (skipped) ++++++ libpng14-build.patch ++++++ Index: libpng-1.4.4/configure.ac =================================================================== --- libpng-1.4.4.orig/configure.ac +++ libpng-1.4.4/configure.ac @@ -16,6 +16,12 @@ dnl should not be necessary to regenerat dnl stamps are correct AC_PREREQ(2.59) +AC_INIT([libpng], [1.4.4], [png-mng-implement(a)lists.sourceforge.net]) +AM_INIT_AUTOMAKE +dnl stop configure from automagically running automake +AM_MAINTAINER_MODE + + dnl Version number stuff here: PNGLIB_VERSION=1.4.4 @@ -23,11 +29,6 @@ PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=4 -AC_INIT([libpng], [1.4.4], [png-mng-implement(a)lists.sourceforge.net]) -AM_INIT_AUTOMAKE -dnl stop configure from automagically running automake -AM_MAINTAINER_MODE - dnl End of version number stuff AC_CONFIG_SRCDIR([pngget.c]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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