April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit opensc for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package opensc for openSUSE:Factory checked in at Fri Apr 23 19:28:29 CEST 2010. -------- --- opensc/opensc.changes 2010-01-01 20:07:56.000000000 +0100 +++ opensc/opensc.changes 2010-04-13 16:37:18.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 13 14:35:32 UTC 2010 - puzel(a)novell.com + +- update to version 0.11.13 + * Modify Rutoken S binary interfaces by Aktiv Co. + * Muscle driver fixed (acl reading issue) + * Many small fixes (e.g. mem leaks) + * Compiling with openssl 1.0.0-beta fixed + * Document integer problem in OpenSC and implement workaround + * Improve entersafe profile to support private data objects +- Require pinentry +- add opensc-libassuan-2.patch +- add opensc-fix-gcc-warnings.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- opensc-0.11.9.tar.bz2 New: ---- opensc-0.11.13.tar.bz2 opensc-fix-gcc-warnings.patch opensc-libassuan-2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensc.spec ++++++ --- /var/tmp/diff_new_pack.B6jy7h/_old 2010-04-23 19:27:51.000000000 +0200 +++ /var/tmp/diff_new_pack.B6jy7h/_new 2010-04-23 19:27:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package opensc (Version 0.11.9) +# spec file for package opensc (Version 0.11.13) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,19 +19,29 @@ Name: opensc -BuildRequires: libassuan-devel libusb-devel openct-devel openssl-devel pcsc-lite-devel pkg-config readline-devel xorg-x11-devel +BuildRequires: libassuan-devel >= 2.0.0 +BuildRequires: libusb-devel +BuildRequires: openct-devel +BuildRequires: openssl-devel +BuildRequires: pcsc-lite-devel +BuildRequires: pkg-config +BuildRequires: readline-devel +BuildRequires: xorg-x11-devel +BuildRequires: libgpg-error-devel # bug437293 %ifarch ppc64 Obsoletes: opensc-64bit %endif # Url: http://www.opensc-project.org/opensc/ -Version: 0.11.9 -Release: 2 +Version: 0.11.13 +Release: 1 Group: Productivity/Security Summary: OpenSC Smart Card Library License: LGPLv2.1+ -Requires: libopensc2 = %{version} pcsc-lite +Requires: libopensc2 = %{version} +Requires: pcsc-lite +Requires: pinentry BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 Source1: %{name}-ADVISORIES @@ -39,6 +49,8 @@ Source2: %{name}-rpmlintrc # and also skip-check-libtool-deps (and add these dependencies to the devel package) Source3: baselibs.conf +Patch0: opensc-libassuan-2.patch +Patch1: opensc-fix-gcc-warnings.patch %description OpenSC provides a set of libraries and utilities to access smart cards. @@ -117,6 +129,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 tr -d '\r' <doc/nonpersistent/wiki.out/trac.css >doc/nonpersistent/wiki.out/trac.css~ touch -r doc/nonpersistent/wiki.out/trac.css doc/nonpersistent/wiki.out/trac.css~ mv doc/nonpersistent/wiki.out/trac.css~ doc/nonpersistent/wiki.out/trac.css @@ -133,6 +147,7 @@ --enable-pcsc\ --enable-openct\ --enable-nsplugin\ + --with-pinentry=/usr/bin/pinentry\ --with-plugindir=%{_libdir}/browser-plugins make %{?jobs:-j%jobs} ++++++ opensc-0.11.9.tar.bz2 -> opensc-0.11.13.tar.bz2 ++++++ ++++ 39214 lines of diff (skipped) ++++++ opensc-fix-gcc-warnings.patch ++++++ Index: opensc-0.11.13/src/libopensc/card-belpic.c =================================================================== --- opensc-0.11.13.orig/src/libopensc/card-belpic.c 2010-02-16 10:03:28.000000000 +0100 +++ opensc-0.11.13/src/libopensc/card-belpic.c 2010-04-13 16:29:22.000000000 +0200 @@ -1338,7 +1338,7 @@ static int belpic_pin_cmd_usage(sc_card_ data->pin1.encoding = data->pin2.encoding = BELPIC_PIN_ENCODING; data->pin1.pad_char = data->pin2.pad_char = BELPIC_PAD_CHAR; data->pin1.min_length = data->pin2.min_length = BELPIC_MIN_USER_PIN_LEN; - data->pin1.max_length = data->pin1.max_length = BELPIC_MAX_USER_PIN_LEN; + data->pin1.max_length = data->pin2.max_length = BELPIC_MAX_USER_PIN_LEN; data->apdu = NULL; return iso_ops->pin_cmd(card, data, tries_left); Index: opensc-0.11.13/src/libopensc/log.h =================================================================== --- opensc-0.11.13.orig/src/libopensc/log.h 2010-02-16 10:03:28.000000000 +0100 +++ opensc-0.11.13/src/libopensc/log.h 2010-04-13 16:30:36.000000000 +0200 @@ -74,8 +74,8 @@ void sc_hex_dump(struct sc_context *ctx, int _ret = (r); \ if (_ret < 0) { \ sc_do_log(ctx, SC_LOG_TYPE_ERROR, __FILE__, __LINE__, __FUNCTION__, "%s: %s\n", (text), sc_strerror(_ret)); \ - return _ret; \ } \ + return _ret; \ } while(0) #define sc_perror(ctx, errno, str) { \ ++++++ opensc-libassuan-2.patch ++++++ --- m4/gpg-error.m4 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ m4/libassuan.m4 | 2 - src/signer/dialog.c | 35 +++++++++++++++++----------- 3 files changed, 88 insertions(+), 14 deletions(-) Index: opensc-0.11.13/m4/libassuan.m4 =================================================================== --- opensc-0.11.13.orig/m4/libassuan.m4 2009-12-13 10:14:26.000000000 +0100 +++ opensc-0.11.13/m4/libassuan.m4 2010-04-13 12:26:56.000000000 +0200 @@ -26,7 +26,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], fi AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) - tmp=ifelse([$1], ,1:0.9.2,$1) + tmp=ifelse([$1], ,2:2.0.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_libassuan_api=`echo "$tmp" | sed 's/$.*$:$.*$/\1/'` min_libassuan_version=`echo "$tmp" | sed 's/$.*$:$.*$/\2/'` Index: opensc-0.11.13/src/signer/dialog.c =================================================================== --- opensc-0.11.13.orig/src/signer/dialog.c 2010-02-16 10:03:25.000000000 +0100 +++ opensc-0.11.13/src/signer/dialog.c 2010-04-13 16:03:10.000000000 +0200 @@ -15,31 +15,31 @@ struct entry_parm_s { char *buffer; }; -static AssuanError +static gpg_error_t getpin_cb (void *opaque, const void *buffer, size_t length) { struct entry_parm_s *parm = (struct entry_parm_s *) opaque; /* we expect the pin to fit on one line */ if (parm->lines || length >= parm->size) - return ASSUAN_Too_Much_Data; + return gpg_error(GPG_ERR_ASS_TOO_MUCH_DATA); /* fixme: we should make sure that the assuan buffer is allocated in secure memory or read the response byte by byte */ memcpy(parm->buffer, buffer, length); parm->buffer[length] = 0; parm->lines++; - return (AssuanError) 0; + return gpg_error(GPG_ERR_NO_ERROR); } int ask_and_verify_pin_code(struct sc_pkcs15_card *p15card, struct sc_pkcs15_object *pin) { - int r; + gpg_error_t r; size_t len; const char *argv[3]; const char *pgmname = PIN_ENTRY; - ASSUAN_CONTEXT ctx; + assuan_context_t ctx = NULL; char buf[500]; char errtext[100]; struct entry_parm_s parm; @@ -48,16 +48,26 @@ int ask_and_verify_pin_code(struct sc_pk argv[0] = pgmname; argv[1] = NULL; - r = assuan_pipe_connect(&ctx, pgmname, (char **) argv, NULL); + assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); + + r = assuan_new(&ctx); + if (r) { + printf("Can't initialize assuan context: %s\n)", + gpg_strerror(r)); + goto err; + } + + r = assuan_pipe_connect(ctx, pgmname, (const char **) argv, \ + NULL, NULL, NULL, 0); if (r) { printf("Can't connect to the PIN entry module: %s\n", - assuan_strerror((AssuanError) r)); + gpg_strerror(r)); goto err; } sprintf(buf, "SETDESC Enter PIN [%s] for digital signing ", pin->label); r = assuan_transact(ctx, buf, NULL, NULL, NULL, NULL, NULL, NULL); if (r) { - printf("SETDESC: %s\n", assuan_strerror((AssuanError) r)); + printf("SETDESC: %s\n", gpg_strerror(r)); goto err; } errtext[0] = 0; @@ -71,12 +81,12 @@ int ask_and_verify_pin_code(struct sc_pk parm.size = sizeof(buf); parm.buffer = buf; r = assuan_transact(ctx, "GETPIN", getpin_cb, &parm, NULL, NULL, NULL, NULL); - if (r == ASSUAN_Canceled) { - assuan_disconnect(ctx); + if (gpg_err_code(r) == GPG_ERR_ASS_CANCELED) { + assuan_release(ctx); return -2; } if (r) { - printf("GETPIN: %s\n", assuan_strerror((AssuanError) r)); + printf("GETPIN: %s\n", gpg_strerror(r)); goto err; } len = strlen(buf); @@ -104,9 +114,9 @@ int ask_and_verify_pin_code(struct sc_pk break; } - assuan_disconnect(ctx); + assuan_release(ctx); return 0; err: - assuan_disconnect(ctx); + assuan_release(ctx); return -1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4 for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri Apr 23 19:27:25 CEST 2010. -------- --- libqt4/libqt4-devel-doc-data.changes 2010-03-23 21:16:48.000000000 +0100 +++ libqt4/libqt4-devel-doc-data.changes 2010-04-11 19:10:40.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 11 17:09:32 UTC 2010 - stefan.bruens(a)rwth-aachen.de + +- fix printing of object-/className when QT_DEBUG_TIMER is set + +------------------------------------------------------------------- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.rT1QNQ/_old 2010-04-23 19:27:02.000000000 +0200 +++ /var/tmp/diff_new_pack.rT1QNQ/_new 2010-04-23 19:27:02.000000000 +0200 @@ -28,7 +28,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.6.2 -Release: 2 +Release: 3 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion 4.6.2 libqt4-devel-doc.spec: same change libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.rT1QNQ/_old 2010-04-23 19:27:02.000000000 +0200 +++ /var/tmp/diff_new_pack.rT1QNQ/_new 2010-04-23 19:27:02.000000000 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.6.2 -Release: 2 +Release: 3 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion 4.6.2 ++++++ qt-debug-timer.diff ++++++ --- /var/tmp/diff_new_pack.rT1QNQ/_old 2010-04-23 19:27:03.000000000 +0200 +++ /var/tmp/diff_new_pack.rT1QNQ/_new 2010-04-23 19:27:03.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- src/corelib/kernel/qeventdispatcher_unix.cpp.orig +++ src/corelib/kernel/qeventdispatcher_unix.cpp -@@ -574,6 +574,20 @@ int QTimerInfoList::activateTimers() +@@ -574,6 +574,21 @@ int QTimerInfoList::activateTimers() if (!firstTimerInfo) { firstTimerInfo = currentTimerInfo; @@ -12,6 +12,7 @@ + debug_timer = getenv("QT_DEBUG_TIMER") ? 1 : 0; + if (debug_timer > 0) { + QString objPath = o->objectName(); ++ if(objPath.isEmpty()) objPath = QLatin1String("<") + o->parent()->metaObject()->className() + QLatin1String(">"); + for (; o->parent(); o = o->parent()) + if (!o->parent()->objectName().isEmpty()) + objPath.prepend(o->parent()->objectName() + "/"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ruby for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package ruby for openSUSE:Factory checked in at Fri Apr 23 19:23:29 CEST 2010. -------- --- ruby/ruby.changes 2010-02-23 13:04:59.000000000 +0100 +++ ruby/ruby.changes 2010-04-23 00:23:13.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Apr 22 22:06:56 UTC 2010 - mrueckert(a)suse.de + +- added ruby-1.8.x_openssl-1.0.patch and + ruby-1.8.x_openssl-1.0-tests.patch: + fix building with openssl 1.0.0 (taken from svn) +- added ruby-1.8.x_yaml2byte.patch: + fix warning about sequence point +- remove requires on glibc-devel again + +------------------------------------------------------------------- +Sat Mar 13 21:25:30 UTC 2010 - crrodriguez(a)opensuse.org + +- ruby-devel requires glibc-devel + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ruby-1.8.x_openssl-1.0-tests.patch ruby-1.8.x_openssl-1.0.patch ruby-1.8.x_yaml2byte.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby.spec ++++++ --- /var/tmp/diff_new_pack.ECj4eE/_old 2010-04-23 19:23:06.000000000 +0200 +++ /var/tmp/diff_new_pack.ECj4eE/_new 2010-04-23 19:23:06.000000000 +0200 @@ -20,7 +20,7 @@ Name: ruby Version: 1.8.7.p249 -Release: 1 +Release: 2 # %define pkg_version 1.8.7 %define patch_level p249 @@ -64,6 +64,9 @@ Patch8: ruby-1.8.7-p72_topdir.patch # can be removed on next version update. pulled from svn Patch9: ruby-1.8.x_digest_non_void_return.patch +Patch10: ruby-1.8.x_openssl-1.0.patch +Patch11: ruby-1.8.x_openssl-1.0-tests.patch +Patch12: ruby-1.8.x_yaml2byte.patch # vendor ruby files taken from: # http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/ Source3: site-specific.rb @@ -246,6 +249,9 @@ %patch7 %patch8 %patch9 +%patch10 +%patch11 +%patch12 %if 0%{?with_bleak_house} for patch in valgrind configure gc ; do patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch ++++++ ruby-1.8.x_openssl-1.0-tests.patch ++++++ ++++ 1465 lines (skipped) ++++++ ruby-1.8.x_openssl-1.0.patch ++++++ ++++ 3407 lines (skipped) ++++++ ruby-1.8.x_yaml2byte.patch ++++++ I: Program causes undefined operation (likely same variable used twiceand post/pre incremented in the same expression). e.g. x = x++; Split it in two operations. W: ruby sequence-point yaml2byte.c:67, 104 yaml2byte.c: In function 'bytestring_append': yaml2byte.c:67:21: warning: operation on 'str->buffer' may be undefined yaml2byte.c: In function 'bytestring_extend': yaml2byte.c:104:25: warning: operation on 'str->buffer' may be undefined #define S_REALLOC_N(var,type,n) (var)=(type*)realloc((char*)(var),sizeof(type)*(n)) so the old code expanded to: str->buffer = str->buffer = (char*)realloc((char*)str->buffer, sizeof(char)*str->length + 1) Index: ext/syck/yaml2byte.c =================================================================== --- ext/syck/yaml2byte.c (revision 27446) +++ ext/syck/yaml2byte.c (working copy) @@ -64,7 +64,7 @@ grow = (length - str->remaining) + CHUNKSIZE; str->remaining += grow; str->length += grow; - str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 ); + S_REALLOC_N( str->buffer, char, str->length + 1 ); assert(str->buffer); } curr = str->buffer + (str->length - str->remaining); @@ -101,7 +101,7 @@ grow = (length - str->remaining) + CHUNKSIZE; str->remaining += grow; str->length += grow; - str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 ); + S_REALLOC_N( str->buffer, char, str->length + 1 ); } curr = str->buffer + (str->length - str->remaining); from = ext->buffer; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 udev for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package udev for openSUSE:Factory checked in at Fri Apr 23 19:22:43 CEST 2010. -------- --- udev/udev.changes 2010-03-09 16:44:37.000000000 +0100 +++ udev/udev.changes 2010-04-21 09:03:54.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Apr 21 08:58:55 CEST 2010 - kay.sievers(a)novell.com + +- Update to version 153 + - fix broken firmware loader + +------------------------------------------------------------------- +Tue Apr 20 09:08:50 CEST 2010 - kay.sievers(a)novell.com + +- Update to version 152 + - firmware loader: missing firmware file fix + - cdrom_id: O_EXCL, phantom-media fixes + - new and fixed keymaps + - trigger by default sends "change" events now instead of "add" + - all_partitions, ignore_remove options are removed +- use trigger --action=add at coldplug time in init script +- drop device-mapper rules, which are shipped by dm now + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- udev-151.tar.bz2 udev-firmware-timout-fix.patch New: ---- udev-153.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.wos7t3/_old 2010-04-23 19:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.wos7t3/_new 2010-04-23 19:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package udev (Version 151) +# spec file for package udev (Version 153) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,9 +20,9 @@ Name: udev Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -Version: 151 -Release: 4 -License: GPLv2+ +Version: 153 +Release: 1 +License: LGPLv2.1+ Group: System/Kernel Summary: A rule-based device node and kernel event manager PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd @@ -40,7 +40,6 @@ Source2: baselibs.conf Source60: boot.udev Source61: boot.udev_retry -Patch0: udev-firmware-timout-fix.patch %description Udev creates and removes device nodes in /dev for devices discovered or @@ -92,7 +91,6 @@ %prep %setup -q -%patch0 -p1 %build # prevent man pages from re-building (xmlto) @@ -115,7 +113,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libudev.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libgudev-1.0.la cp -ax README $RPM_BUILD_ROOT%{_docdir}/udev -cp rules/packages/64-device-mapper.rules $RPM_BUILD_ROOT/lib/udev/rules.d/ %ifarch ppc ppc64 cp rules/packages/40-ppc.rules $RPM_BUILD_ROOT/lib/udev/rules.d/ %endif @@ -205,7 +202,7 @@ /lib/udev/write_net_rules /lib/udev/rule_generator.functions /lib/udev/v4l_id -/lib/udev/modem-modeswitch +/lib/udev/mobile-action-modeswitch /lib/udev/pci-db /lib/udev/usb-db /lib/udev/udev-acl ++++++ boot.udev ++++++ --- /var/tmp/diff_new_pack.wos7t3/_old 2010-04-23 19:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.wos7t3/_new 2010-04-23 19:22:22.000000000 +0200 @@ -49,8 +49,8 @@ # trigger events for all devices echo -n "Loading drivers, configuring devices: " - /sbin/udevadm trigger --type=subsystems - /sbin/udevadm trigger --type=devices + /sbin/udevadm trigger --type=subsystems --action=add + /sbin/udevadm trigger --type=devices --action=add # wait for events to finish /sbin/udevadm settle --timeout=$udev_timeout @@ -85,7 +85,7 @@ cp -axT --remove-destination /lib/udev/devices /dev root_symlink_rule $DAEMON $udevd_args - /sbin/udevadm trigger + /sbin/udevadm trigger --action=add /sbin/udevadm settle --timeout=$udev_timeout rc_status -v ;; ++++++ udev-151.tar.bz2 -> udev-153.tar.bz2 ++++++ ++++ 20560 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11 for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Fri Apr 23 19:22:01 CEST 2010. -------- --- xorg-x11/xorg-x11.changes 2010-04-11 13:15:17.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2010-04-20 12:33:20.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Apr 20 12:31:58 CEST 2010 - eich(a)suse.de + +- Add support for 'seamless boot experience' to display manager + startup script. This also requires bootsplash kernel support. + We check the version of the bootsplash kernel code to find out + if the required feature is supported. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.XykfQ4/_old 2010-04-23 19:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.XykfQ4/_new 2010-04-23 19:20:36.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 3 +Release: 4 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2010-03-19 18:18:08.000000000 +0100 +++ new/etc/init.d/xdm 2010-04-20 12:29:51.000000000 +0200 @@ -142,8 +142,29 @@ test ! -x "$DISPLAYMANAGER" && DISPLAYMANAGER=$XDM_BIN rc_reset + +splashcopy() +{ + local from=$1 + local to=$2 + if [ "$SPLASH" = yes ] + then + ver=$(sed "s/.*v$[[:digit:]]$\.$[[:digit:]]$.*/\\1\\2/" /proc/splash) + if [ $ver -gt 31 ] + then + echo "copy $from $to" > /proc/splash + echo "@$to silent" > /proc/splash + echo "@$to show -1" > /proc/splash + fi + fi +} + case "$1" in start) + if [ "$DISPLAYMANAGER" = "$KDM4_BIN" ] \ + || [ "$DISPLAYMANAGER" = "$GDM_BIN" ]; then + splashcopy 0 6 + fi # Avoid duplicated messages when earlyxdm is in use if [ "$DISPLAYMANAGER" = "$KDM_BIN" -a -s $KDM_PIDFILE ]; then /sbin/checkproc -p $KDM_PIDFILE $KDM_BIN && rc_exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at Fri Apr 23 19:20:20 CEST 2010. -------- --- alsa/alsa.changes 2010-03-17 14:34:11.000000000 +0100 +++ alsa/alsa.changes 2010-04-19 10:39:18.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 19 10:38:27 CEST 2010 - tiwai(a)suse.de + +- updated to version 1.0.23: + * including previous fixes + * pcm_share plugin: fix pcm->monotonic setup in open() function + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- alsa-lib-1.0.22.tar.bz2 alsa-lib-dmix-add-s24-le-support.diff alsa-lib-fix-s24-3le-softvol.diff alsa-lib-fix-snd_pcm_sw_params_set_period_event.diff alsa-lib-modem-conf-off-hook.diff alsa-lib-pcm-close-event-timer.diff alsa-lib-pcm-direct-drain-enhance.diff alsa-lib-pcm-fix-read-write_areas.diff alsa-lib-pcm-show-errno.diff New: ---- alsa-lib-1.0.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.KBtOyg/_old 2010-04-23 19:19:35.000000000 +0200 +++ /var/tmp/diff_new_pack.KBtOyg/_new 2010-04-23 19:19:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package alsa (Version 1.0.22) +# spec file for package alsa (Version 1.0.23) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: alsa BuildRequires: doxygen -%define package_version 1.0.22 -License: GPLv2+ +%define package_version 1.0.23 +License: LGPLv2.1+ Group: System/Libraries Requires: alsa-utils Recommends: alsa-plugins alsa-oss @@ -33,8 +33,8 @@ %endif # Summary: Advanced Linux Sound Architecture -Version: 1.0.22 -Release: 3 +Version: 1.0.23 +Release: 1 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source2: baselibs.conf Source8: 40-alsa.rules @@ -52,14 +52,6 @@ Source33: alsa-info.sh Source34: alsa-init.sh # Patch: alsa-lib-git-fixes.diff -Patch1: alsa-lib-pcm-close-event-timer.diff -Patch2: alsa-lib-fix-s24-3le-softvol.diff -Patch3: alsa-lib-modem-conf-off-hook.diff -Patch4: alsa-lib-pcm-fix-read-write_areas.diff -Patch5: alsa-lib-fix-snd_pcm_sw_params_set_period_event.diff -Patch6: alsa-lib-dmix-add-s24-le-support.diff -Patch7: alsa-lib-pcm-direct-drain-enhance.diff -Patch8: alsa-lib-pcm-show-errno.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -135,14 +127,6 @@ %prep %setup -q -n alsa-lib-%{package_version} # %patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 # hack to fix build on older distros %if %suse_version < 1100 %ifarch %ix86 ++++++ alsa-lib-1.0.22.tar.bz2 -> alsa-lib-1.0.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/configure new/alsa-lib-1.0.23/configure --- old/alsa-lib-1.0.22/configure 2009-12-16 16:27:29.000000000 +0100 +++ new/alsa-lib-1.0.23/configure 2010-04-16 13:17:49.000000000 +0200 @@ -2449,7 +2449,7 @@ # Define the identity of the package. PACKAGE=alsa-lib - VERSION=1.0.22 + VERSION=1.0.23 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/configure.in new/alsa-lib-1.0.23/configure.in --- old/alsa-lib-1.0.22/configure.in 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/configure.in 2010-04-16 13:11:05.000000000 +0200 @@ -12,7 +12,7 @@ dnl remove API = c+1:0:0 dnl ************************************************* AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(alsa-lib, 1.0.22) +AM_INIT_AUTOMAKE(alsa-lib, 1.0.23) eval LIBTOOL_VERSION_INFO="2:0:0" dnl ************************************************* AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/include/control.h new/alsa-lib-1.0.23/include/control.h --- old/alsa-lib-1.0.22/include/control.h 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/include/control.h 2010-04-16 13:11:05.000000000 +0200 @@ -423,6 +423,7 @@ void snd_ctl_elem_value_free(snd_ctl_elem_value_t *obj); void snd_ctl_elem_value_clear(snd_ctl_elem_value_t *obj); void snd_ctl_elem_value_copy(snd_ctl_elem_value_t *dst, const snd_ctl_elem_value_t *src); +int snd_ctl_elem_value_compare(snd_ctl_elem_value_t *left, const snd_ctl_elem_value_t *right); void snd_ctl_elem_value_get_id(const snd_ctl_elem_value_t *obj, snd_ctl_elem_id_t *ptr); unsigned int snd_ctl_elem_value_get_numid(const snd_ctl_elem_value_t *obj); snd_ctl_elem_iface_t snd_ctl_elem_value_get_interface(const snd_ctl_elem_value_t *obj); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/include/iatomic.h new/alsa-lib-1.0.23/include/iatomic.h --- old/alsa-lib-1.0.22/include/iatomic.h 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/include/iatomic.h 2010-04-16 13:11:05.000000000 +0200 @@ -1079,6 +1079,29 @@ #endif /* __sh__ */ +#ifdef __bfin__ + +#include <bfin_fixed_code.h> + +typedef struct { volatile int counter; } atomic_t; + +#define ATOMIC_INIT(i) { (i) } + +#define atomic_read(v) ((v)->counter) +#define atomic_set(v,i) (((v)->counter) = (i)) +#define atomic_add(i,v) bfin_atomic_add32(&(v)->counter, i) +#define atomic_sub(i,v) bfin_atomic_sub32(&(v)->counter, i) +#define atomic_inc(v) bfin_atomic_inc32(&(v)->counter); +#define atomic_dec(v) bfin_atomic_dec32(&(v)->counter); + +#define mb() __asm__ __volatile__ ("" : : : "memory") +#define rmb() mb() +#define wmb() mb() + +#define IATOMIC_DEFINED 1 + +#endif /* __bfin__ */ + #ifndef IATOMIC_DEFINED /* * non supported architecture. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/include/version.h new/alsa-lib-1.0.23/include/version.h --- old/alsa-lib-1.0.22/include/version.h 2009-12-16 16:27:39.000000000 +0100 +++ new/alsa-lib-1.0.23/include/version.h 2010-04-16 13:18:02.000000000 +0200 @@ -4,12 +4,12 @@ #define SND_LIB_MAJOR 1 /**< major number of library version */ #define SND_LIB_MINOR 0 /**< minor number of library version */ -#define SND_LIB_SUBMINOR 22 /**< subminor number of library version */ +#define SND_LIB_SUBMINOR 23 /**< subminor number of library version */ #define SND_LIB_EXTRAVER 1000000 /**< extra version number, used mainly for betas */ /** library version */ #define SND_LIB_VERSION ((SND_LIB_MAJOR<<16)|\ (SND_LIB_MINOR<<8)|\ SND_LIB_SUBMINOR) /** library version (string) */ -#define SND_LIB_VERSION_STR "1.0.22" +#define SND_LIB_VERSION_STR "1.0.23" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/libtool new/alsa-lib-1.0.23/libtool --- old/alsa-lib-1.0.22/libtool 2009-12-16 16:27:36.000000000 +0100 +++ new/alsa-lib-1.0.23/libtool 2010-04-16 13:17:57.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # libtoolT - Provide generalized library-building support services. -# Generated automatically by (GNU alsa-lib 1.0.22) +# Generated automatically by (GNU alsa-lib 1.0.23) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/control/control.c new/alsa-lib-1.0.23/src/control/control.c --- old/alsa-lib-1.0.22/src/control/control.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/control/control.c 2010-04-16 13:11:05.000000000 +0200 @@ -2249,6 +2249,18 @@ } /** + * \brief compare one #snd_ctl_elem_value_t to another + * \param dst pointer to destination + * \param src pointer to source + * \return 0 on match, less than or greater than otherwise, see memcmp + */ +int snd_ctl_elem_value_compare(snd_ctl_elem_value_t *left, const snd_ctl_elem_value_t *right) +{ + assert(left && right); + return memcmp(left, right, sizeof(*left)); +} + +/** * \brief Get CTL element identifier of a CTL element id/value * \param obj CTL element id/value * \param ptr Pointer to returned CTL element identifier diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/control/setup.c new/alsa-lib-1.0.23/src/control/setup.c --- old/alsa-lib-1.0.22/src/control/setup.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/control/setup.c 2010-04-16 13:11:05.000000000 +0200 @@ -192,7 +192,17 @@ return err; } } - if (elem->preserve) { + /* Only restore the old value if it differs from the requested + * value, because if it has changed restoring the old value + * overrides the change. Take for example, a voice modem with + * a .conf that sets preserve off-hook. Start playback (on-hook + * to off-hook), start record (off-hook to off-hook), stop + * playback (off-hook to restore on-hook), stop record (on-hook + * to restore off-hook), Clearly you don't want to leave the + * modem "on the phone" now that there isn't any playback or + * recording active. + */ + if (elem->preserve && snd_ctl_elem_value_compare(elem->val, elem->old)) { err = snd_ctl_elem_write(h->ctl, elem->old); if (err < 0) { SNDERR("Cannot restore ctl elem"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm.c new/alsa-lib-1.0.23/src/pcm/pcm.c --- old/alsa-lib-1.0.22/src/pcm/pcm.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm.c 2010-04-16 13:11:05.000000000 +0200 @@ -6528,46 +6528,51 @@ { snd_pcm_uframes_t xfer = 0; snd_pcm_sframes_t err = 0; - snd_pcm_state_t state = snd_pcm_state(pcm); + snd_pcm_state_t state; if (size == 0) return 0; - switch (state) { - case SND_PCM_STATE_PREPARED: - err = snd_pcm_start(pcm); - if (err < 0) - goto _end; - break; - case SND_PCM_STATE_DRAINING: - case SND_PCM_STATE_RUNNING: - break; - case SND_PCM_STATE_XRUN: - return -EPIPE; - case SND_PCM_STATE_SUSPENDED: - return -ESTRPIPE; - case SND_PCM_STATE_DISCONNECTED: - return -ENODEV; - default: - return -EBADFD; - } - while (size > 0) { snd_pcm_uframes_t frames; snd_pcm_sframes_t avail; _again: - if (state == SND_PCM_STATE_RUNNING) { + state = snd_pcm_state(pcm); + switch (state) { + case SND_PCM_STATE_PREPARED: + err = snd_pcm_start(pcm); + if (err < 0) + goto _end; + break; + case SND_PCM_STATE_RUNNING: err = snd_pcm_hwsync(pcm); if (err < 0) goto _end; + break; + case SND_PCM_STATE_DRAINING: + case SND_PCM_STATE_PAUSED: + break; + case SND_PCM_STATE_XRUN: + err = -EPIPE; + goto _end; + case SND_PCM_STATE_SUSPENDED: + err = -ESTRPIPE; + goto _end; + case SND_PCM_STATE_DISCONNECTED: + err = -ENODEV; + goto _end; + default: + err = -EBADFD; + goto _end; } avail = snd_pcm_avail_update(pcm); if (avail < 0) { err = avail; goto _end; } - if ((snd_pcm_uframes_t)avail < pcm->avail_min && - size > (snd_pcm_uframes_t)avail) { + if (avail == 0) { + if (state == SND_PCM_STATE_DRAINING) + goto _end; if (pcm->mode & SND_PCM_NONBLOCK) { err = -EAGAIN; goto _end; @@ -6602,33 +6607,37 @@ { snd_pcm_uframes_t xfer = 0; snd_pcm_sframes_t err = 0; - snd_pcm_state_t state = snd_pcm_state(pcm); + snd_pcm_state_t state; if (size == 0) return 0; - switch (state) { - case SND_PCM_STATE_PREPARED: - case SND_PCM_STATE_RUNNING: - break; - case SND_PCM_STATE_XRUN: - return -EPIPE; - case SND_PCM_STATE_SUSPENDED: - return -ESTRPIPE; - case SND_PCM_STATE_DISCONNECTED: - return -ENODEV; - default: - return -EBADFD; - } - while (size > 0) { snd_pcm_uframes_t frames; snd_pcm_sframes_t avail; _again: - if (state == SND_PCM_STATE_RUNNING) { + state = snd_pcm_state(pcm); + switch (state) { + case SND_PCM_STATE_PREPARED: + case SND_PCM_STATE_PAUSED: + break; + case SND_PCM_STATE_RUNNING: err = snd_pcm_hwsync(pcm); if (err < 0) goto _end; + break; + case SND_PCM_STATE_XRUN: + err = -EPIPE; + goto _end; + case SND_PCM_STATE_SUSPENDED: + err = -ESTRPIPE; + goto _end; + case SND_PCM_STATE_DISCONNECTED: + err = -ENODEV; + goto _end; + default: + err = -EBADFD; + goto _end; } avail = snd_pcm_avail_update(pcm); if (avail < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_direct.c new/alsa-lib-1.0.23/src/pcm/pcm_direct.c --- old/alsa-lib-1.0.22/src/pcm/pcm_direct.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_direct.c 2010-04-16 13:11:05.000000000 +0200 @@ -540,7 +540,6 @@ int snd_pcm_direct_timer_stop(snd_pcm_direct_t *dmix) { snd_timer_stop(dmix->timer); - snd_pcm_direct_clear_timer_queue(dmix); return 0; } @@ -567,6 +566,7 @@ switch (snd_pcm_state(dmix->spcm)) { case SND_PCM_STATE_XRUN: case SND_PCM_STATE_SUSPENDED: + case SND_PCM_STATE_SETUP: events |= POLLERR; break; default: @@ -577,6 +577,7 @@ switch (snd_pcm_state(pcm)) { case SND_PCM_STATE_XRUN: case SND_PCM_STATE_SUSPENDED: + case SND_PCM_STATE_SETUP: events |= POLLERR; break; default: @@ -888,6 +889,7 @@ SND_PCM_FORMAT_S32 ^ SND_PCM_FORMAT_S32_LE ^ SND_PCM_FORMAT_S32_BE, SND_PCM_FORMAT_S16, SND_PCM_FORMAT_S16 ^ SND_PCM_FORMAT_S16_LE ^ SND_PCM_FORMAT_S16_BE, + SND_PCM_FORMAT_S24_LE, SND_PCM_FORMAT_S24_3LE, SND_PCM_FORMAT_U8, }; @@ -1125,8 +1127,9 @@ snd_timer_poll_descriptors(dmix->timer, &dmix->timer_fd, 1); dmix->poll_fd = dmix->timer_fd.fd; - dmix->timer_event_suspend = 1<<SND_TIMER_EVENT_MSUSPEND; - dmix->timer_event_resume = 1<<SND_TIMER_EVENT_MRESUME; + dmix->timer_events = (1<<SND_TIMER_EVENT_MSUSPEND) | + (1<<SND_TIMER_EVENT_MRESUME) | + (1<<SND_TIMER_EVENT_STOP); /* * Some hacks for older kernel drivers @@ -1145,9 +1148,15 @@ * suspend/resume events. */ if (ver < SNDRV_PROTOCOL_VERSION(2, 0, 5)) { - dmix->timer_event_suspend = 1<<SND_TIMER_EVENT_MPAUSE; - dmix->timer_event_resume = 1<<SND_TIMER_EVENT_MCONTINUE; + dmix->timer_events &= ~((1<<SND_TIMER_EVENT_MSUSPEND) | + (1<<SND_TIMER_EVENT_MRESUME)); + dmix->timer_events |= (1<<SND_TIMER_EVENT_MPAUSE) | + (1<<SND_TIMER_EVENT_MCONTINUE); } + /* In older versions, use SND_TIMER_EVENT_START too. + */ + if (ver < SNDRV_PROTOCOL_VERSION(2, 0, 6)) + dmix->timer_events |= 1<<SND_TIMER_EVENT_START; } return 0; } @@ -1274,8 +1283,7 @@ snd_timer_params_set_ticks(params, 1); if (dmix->tread) { filter = (1<<SND_TIMER_EVENT_TICK) | - dmix->timer_event_suspend | - dmix->timer_event_resume; + dmix->timer_events; snd_timer_params_set_filter(params, filter); } ret = snd_timer_params(dmix->timer, params); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_direct.h new/alsa-lib-1.0.23/src/pcm/pcm_direct.h --- old/alsa-lib-1.0.22/src/pcm/pcm_direct.h 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_direct.h 2010-04-16 13:11:05.000000000 +0200 @@ -142,10 +142,9 @@ int hw_fd; /* hardware file descriptor */ struct pollfd timer_fd; int poll_fd; - int tread; - int timer_need_poll; - unsigned int timer_event_suspend; - unsigned int timer_event_resume; + int tread: 1; + int timer_need_poll: 1; + unsigned int timer_events; int server_fd; pid_t server_pid; snd_timer_t *timer; /* timer used as poll_fd */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_dmix.c new/alsa-lib-1.0.23/src/pcm/pcm_dmix.c --- old/alsa-lib-1.0.22/src/pcm/pcm_dmix.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_dmix.c 2010-04-16 13:11:05.000000000 +0200 @@ -174,6 +174,10 @@ sample_size = 4; do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_32; break; + case SND_PCM_FORMAT_S24_LE: + sample_size = 4; + do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24; + break; case SND_PCM_FORMAT_S24_3LE: sample_size = 3; do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24; @@ -238,6 +242,10 @@ sample_size = 4; do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_32; break; + case SND_PCM_FORMAT_S24_LE: + sample_size = 4; + do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24; + break; case SND_PCM_FORMAT_S24_3LE: sample_size = 3; do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24; @@ -597,8 +605,8 @@ snd_pcm_direct_t *dmix = pcm->private_data; if (dmix->state == SND_PCM_STATE_OPEN) return -EBADFD; - snd_pcm_direct_timer_stop(dmix); dmix->state = SND_PCM_STATE_SETUP; + snd_pcm_direct_timer_stop(dmix); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_dmix_generic.c new/alsa-lib-1.0.23/src/pcm/pcm_dmix_generic.c --- old/alsa-lib-1.0.22/src/pcm/pcm_dmix_generic.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_dmix_generic.c 2010-04-16 13:11:05.000000000 +0200 @@ -122,7 +122,7 @@ #define generic_dmix_supported_format \ ((1ULL << SND_PCM_FORMAT_S16_LE) | (1ULL << SND_PCM_FORMAT_S32_LE) |\ (1ULL << SND_PCM_FORMAT_S16_BE) | (1ULL << SND_PCM_FORMAT_S32_BE) |\ - (1ULL << SND_PCM_FORMAT_S24_3LE) | \ + (1ULL << SND_PCM_FORMAT_S24_LE) | (1ULL << SND_PCM_FORMAT_S24_3LE) | \ (1ULL << SND_PCM_FORMAT_U8)) #include <byteswap.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_dmix_i386.c new/alsa-lib-1.0.23/src/pcm/pcm_dmix_i386.c --- old/alsa-lib-1.0.22/src/pcm/pcm_dmix_i386.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_dmix_i386.c 2010-04-16 13:11:05.000000000 +0200 @@ -77,6 +77,7 @@ #define i386_dmix_supported_format \ ((1ULL << SND_PCM_FORMAT_S16_LE) |\ (1ULL << SND_PCM_FORMAT_S32_LE) |\ + (1ULL << SND_PCM_FORMAT_S24_LE) |\ (1ULL << SND_PCM_FORMAT_S24_3LE)) #define dmix_supported_format \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_dshare.c new/alsa-lib-1.0.23/src/pcm/pcm_dshare.c --- old/alsa-lib-1.0.22/src/pcm/pcm_dshare.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_dshare.c 2010-04-16 13:11:05.000000000 +0200 @@ -355,9 +355,9 @@ snd_pcm_direct_t *dshare = pcm->private_data; if (dshare->state == SND_PCM_STATE_OPEN) return -EBADFD; + dshare->state = SND_PCM_STATE_SETUP; snd_pcm_direct_timer_stop(dshare); do_silence(pcm); - dshare->state = SND_PCM_STATE_SETUP; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_dsnoop.c new/alsa-lib-1.0.23/src/pcm/pcm_dsnoop.c --- old/alsa-lib-1.0.22/src/pcm/pcm_dsnoop.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_dsnoop.c 2010-04-16 13:11:05.000000000 +0200 @@ -280,8 +280,8 @@ snd_pcm_direct_t *dsnoop = pcm->private_data; if (dsnoop->state == SND_PCM_STATE_OPEN) return -EBADFD; - snd_timer_stop(dsnoop->timer); dsnoop->state = SND_PCM_STATE_SETUP; + snd_timer_stop(dsnoop->timer); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_hw.c new/alsa-lib-1.0.23/src/pcm/pcm_hw.c --- old/alsa-lib-1.0.22/src/pcm/pcm_hw.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_hw.c 2010-04-16 13:11:05.000000000 +0200 @@ -135,7 +135,7 @@ err = ioctl((hw)->fd, SNDRV_PCM_IOCTL_SYNC_PTR, (hw)->sync_ptr); if (err < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_SYNC_PTR failed"); + SYSMSG("SNDRV_PCM_IOCTL_SYNC_PTR failed (%i)", err); return err; } return 0; @@ -202,7 +202,7 @@ if ((flags = fcntl(fd, F_GETFL)) < 0) { err = -errno; - SYSMSG("F_GETFL failed"); + SYSMSG("F_GETFL failed (%i)", err); return err; } if (nonblock) @@ -211,7 +211,7 @@ flags &= ~O_NONBLOCK; if (fcntl(fd, F_SETFL, flags) < 0) { err = -errno; - SYSMSG("F_SETFL for O_NONBLOCK failed"); + SYSMSG("F_SETFL for O_NONBLOCK failed (%i)", err); return err; } return 0; @@ -225,7 +225,7 @@ if ((flags = fcntl(fd, F_GETFL)) < 0) { err = -errno; - SYSMSG("F_GETFL failed"); + SYSMSG("F_GETFL failed (%i)", err); return err; } if (sig >= 0) @@ -234,19 +234,19 @@ flags &= ~O_ASYNC; if (fcntl(fd, F_SETFL, flags) < 0) { err = -errno; - SYSMSG("F_SETFL for O_ASYNC failed"); + SYSMSG("F_SETFL for O_ASYNC failed (%i)", err); return err; } if (sig < 0) return 0; if (fcntl(fd, F_SETSIG, (long)sig) < 0) { err = -errno; - SYSMSG("F_SETSIG failed"); + SYSMSG("F_SETSIG failed (%i)", err); return err; } if (fcntl(fd, F_SETOWN, (long)pid) < 0) { err = -errno; - SYSMSG("F_SETOWN failed"); + SYSMSG("F_SETOWN failed (%i)", err); return err; } return 0; @@ -258,7 +258,7 @@ int fd = hw->fd, err; if (ioctl(fd, SNDRV_PCM_IOCTL_INFO, info) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_INFO failed"); + SYSMSG("SNDRV_PCM_IOCTL_INFO failed (%i)", err); return err; } return 0; @@ -323,7 +323,7 @@ int err; if (hw_params_call(hw, params) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_HW_PARAMS failed"); + SYSMSG("SNDRV_PCM_IOCTL_HW_PARAMS failed (%i)", err); return err; } params->info &= ~0xf0000000; @@ -338,18 +338,6 @@ return 0; } -static int snd_pcm_hw_hw_free(snd_pcm_t *pcm) -{ - snd_pcm_hw_t *hw = pcm->private_data; - int fd = hw->fd, err; - if (ioctl(fd, SNDRV_PCM_IOCTL_HW_FREE) < 0) { - err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_HW_FREE failed"); - return err; - } - return 0; -} - static void snd_pcm_hw_close_timer(snd_pcm_hw_t *hw) { if (hw->period_timer) { @@ -367,9 +355,9 @@ if (enable) { snd_timer_params_alloca(&params); - err = snd_timer_hw_open(&hw->period_timer, "hw-pcm-period-event", SND_TIMER_CLASS_PCM, SND_TIMER_SCLASS_NONE, hw->card, hw->device, hw->subdevice, SND_TIMER_OPEN_NONBLOCK | SND_TIMER_OPEN_TREAD); + err = snd_timer_hw_open(&hw->period_timer, "hw-pcm-period-event", SND_TIMER_CLASS_PCM, SND_TIMER_SCLASS_NONE, hw->card, hw->device, (hw->subdevice << 1) | (pcm->stream & 1), SND_TIMER_OPEN_NONBLOCK | SND_TIMER_OPEN_TREAD); if (err < 0) { - err = snd_timer_hw_open(&hw->period_timer, "hw-pcm-period-event", SND_TIMER_CLASS_PCM, SND_TIMER_SCLASS_NONE, hw->card, hw->device, hw->subdevice, SND_TIMER_OPEN_NONBLOCK); + err = snd_timer_hw_open(&hw->period_timer, "hw-pcm-period-event", SND_TIMER_CLASS_PCM, SND_TIMER_SCLASS_NONE, hw->card, hw->device, (hw->subdevice << 1) | (pcm->stream & 1), SND_TIMER_OPEN_NONBLOCK); return err; } if (snd_timer_poll_descriptors_count(hw->period_timer) != 1) { @@ -421,6 +409,20 @@ } else { snd_pcm_hw_close_timer(hw); pcm->fast_ops = &snd_pcm_hw_fast_ops; + hw->period_event = 0; + } + return 0; +} + +static int snd_pcm_hw_hw_free(snd_pcm_t *pcm) +{ + snd_pcm_hw_t *hw = pcm->private_data; + int fd = hw->fd, err; + snd_pcm_hw_change_timer(pcm, 0); + if (ioctl(fd, SNDRV_PCM_IOCTL_HW_FREE) < 0) { + err = -errno; + SYSMSG("SNDRV_PCM_IOCTL_HW_FREE failed (%i)", err); + return err; } return 0; } @@ -443,7 +445,7 @@ } if (ioctl(fd, SNDRV_PCM_IOCTL_SW_PARAMS, params) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_SW_PARAMS failed"); + SYSMSG("SNDRV_PCM_IOCTL_SW_PARAMS failed (%i)", err); return err; } params->period_event = old_period_event; @@ -465,7 +467,7 @@ i.channel = info->channel; if (ioctl(fd, SNDRV_PCM_IOCTL_CHANNEL_INFO, &i) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_CHANNEL_INFO failed"); + SYSMSG("SNDRV_PCM_IOCTL_CHANNEL_INFO failed (%i)", err); return err; } info->channel = i.channel; @@ -484,7 +486,7 @@ int fd = hw->fd, err; if (ioctl(fd, SNDRV_PCM_IOCTL_STATUS, status) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_STATUS failed"); + SYSMSG("SNDRV_PCM_IOCTL_STATUS failed (%i)", err); return err; } if (SNDRV_PROTOCOL_VERSION(2, 0, 5) > hw->version) { @@ -509,7 +511,7 @@ int fd = hw->fd, err; if (ioctl(fd, SNDRV_PCM_IOCTL_DELAY, delayp) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_DELAY failed"); + SYSMSG("SNDRV_PCM_IOCTL_DELAY failed (%i)", err); return err; } return 0; @@ -527,7 +529,7 @@ } else { if (ioctl(fd, SNDRV_PCM_IOCTL_HWSYNC) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_HWSYNC failed"); + SYSMSG("SNDRV_PCM_IOCTL_HWSYNC failed (%i)", err); return err; } } @@ -553,7 +555,7 @@ int fd = hw->fd, err; if (ioctl(fd, SNDRV_PCM_IOCTL_PREPARE) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_PREPARE failed"); + SYSMSG("SNDRV_PCM_IOCTL_PREPARE failed (%i)", err); return err; } return sync_ptr(hw, SNDRV_PCM_SYNC_PTR_APPL); @@ -565,7 +567,7 @@ int fd = hw->fd, err; if (ioctl(fd, SNDRV_PCM_IOCTL_RESET) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_RESET failed"); + SYSMSG("SNDRV_PCM_IOCTL_RESET failed (%i)", err); return err; } return sync_ptr(hw, SNDRV_PCM_SYNC_PTR_APPL); @@ -582,7 +584,7 @@ sync_ptr(hw, 0); if (ioctl(hw->fd, SNDRV_PCM_IOCTL_START) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_START failed"); + SYSMSG("SNDRV_PCM_IOCTL_START failed (%i)", err); #if 0 if (err == -EBADFD) SNDERR("PCM state = %s", snd_pcm_state_name(snd_pcm_hw_state(pcm))); @@ -598,7 +600,7 @@ int err; if (ioctl(hw->fd, SNDRV_PCM_IOCTL_DROP) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_DROP failed"); + SYSMSG("SNDRV_PCM_IOCTL_DROP failed (%i)", err); return err; } else { } @@ -611,7 +613,7 @@ int err; if (ioctl(hw->fd, SNDRV_PCM_IOCTL_DRAIN) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_DRAIN failed"); + SYSMSG("SNDRV_PCM_IOCTL_DRAIN failed (%i)", err); return err; } return 0; @@ -623,7 +625,7 @@ int err; if (ioctl(hw->fd, SNDRV_PCM_IOCTL_PAUSE, enable) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_PAUSE failed"); + SYSMSG("SNDRV_PCM_IOCTL_PAUSE failed (%i)", err); return err; } return 0; @@ -640,7 +642,7 @@ int err; if (ioctl(hw->fd, SNDRV_PCM_IOCTL_REWIND, &frames) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_REWIND failed"); + SYSMSG("SNDRV_PCM_IOCTL_REWIND failed (%i)", err); return err; } err = sync_ptr(hw, SNDRV_PCM_SYNC_PTR_APPL); @@ -661,7 +663,7 @@ if (SNDRV_PROTOCOL_VERSION(2, 0, 4) <= hw->version) { if (ioctl(hw->fd, SNDRV_PCM_IOCTL_FORWARD, &frames) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_FORWARD failed"); + SYSMSG("SNDRV_PCM_IOCTL_FORWARD failed (%i)", err); return err; } err = sync_ptr(hw, SNDRV_PCM_SYNC_PTR_APPL); @@ -704,7 +706,7 @@ int fd = hw->fd, err; if (ioctl(fd, SNDRV_PCM_IOCTL_RESUME) < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_RESUME failed"); + SYSMSG("SNDRV_PCM_IOCTL_RESUME failed (%i)", err); return err; } return 0; @@ -715,7 +717,7 @@ snd_pcm_hw_t *hw1 = pcm1->private_data; snd_pcm_hw_t *hw2 = pcm2->private_data; if (ioctl(hw1->fd, SNDRV_PCM_IOCTL_LINK, hw2->fd) < 0) { - SYSMSG("SNDRV_PCM_IOCTL_LINK failed"); + SYSMSG("SNDRV_PCM_IOCTL_LINK failed (%i)", -errno); return -errno; } return 0; @@ -724,7 +726,7 @@ static int snd_pcm_hw_link_slaves(snd_pcm_t *pcm, snd_pcm_t *master) { if (master->type != SND_PCM_TYPE_HW) { - SYSMSG("Invalid type for SNDRV_PCM_IOCTL_LINK"); + SYSMSG("Invalid type for SNDRV_PCM_IOCTL_LINK (%i)", master->type); return -EINVAL; } return hw_link(master, pcm); @@ -745,7 +747,7 @@ snd_pcm_hw_t *hw = pcm->private_data; if (ioctl(hw->fd, SNDRV_PCM_IOCTL_UNLINK) < 0) { - SYSMSG("SNDRV_PCM_IOCTL_UNLINK failed"); + SYSMSG("SNDRV_PCM_IOCTL_UNLINK failed (%i)", -errno); return -errno; } return 0; @@ -845,7 +847,7 @@ err = ioctl(hw->fd, SNDRV_PCM_IOCTL_SYNC_PTR, &sync_ptr); if (err < 0) { err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_SYNC_PTR failed"); + SYSMSG("SNDRV_PCM_IOCTL_SYNC_PTR failed (%i)", err); return err; } hw->sync_ptr = calloc(1, sizeof(struct sndrv_pcm_sync_ptr)); @@ -872,7 +874,7 @@ hw->fd, SNDRV_PCM_MMAP_OFFSET_CONTROL); if (ptr == MAP_FAILED || ptr == NULL) { err = -errno; - SYSMSG("control mmap failed"); + SYSMSG("control mmap failed (%i)", err); return err; } hw->mmap_control = ptr; @@ -893,7 +895,7 @@ } else { if (munmap((void*)hw->mmap_status, page_align(sizeof(*hw->mmap_status))) < 0) { err = -errno; - SYSMSG("status munmap failed"); + SYSMSG("status munmap failed (%i)", err); return err; } } @@ -910,7 +912,7 @@ } else { if (munmap(hw->mmap_control, page_align(sizeof(*hw->mmap_control))) < 0) { err = -errno; - SYSMSG("control munmap failed"); + SYSMSG("control munmap failed (%i)", err); return err; } } @@ -933,7 +935,7 @@ int err = 0; if (close(hw->fd)) { err = -errno; - SYSMSG("close failed\n"); + SYSMSG("close failed (%i)\n", err); } snd_pcm_hw_munmap_status(pcm); snd_pcm_hw_munmap_control(pcm); @@ -1127,7 +1129,7 @@ memset(&info, 0, sizeof(info)); if (ioctl(fd, SNDRV_PCM_IOCTL_INFO, &info) < 0) { ret = -errno; - SYSMSG("SNDRV_PCM_IOCTL_INFO failed"); + SYSMSG("SNDRV_PCM_IOCTL_INFO failed (%i)", ret); close(fd); return ret; @@ -1146,7 +1148,7 @@ if (ioctl(fd, SNDRV_PCM_IOCTL_PVERSION, &ver) < 0) { ret = -errno; - SYSMSG("SNDRV_PCM_IOCTL_PVERSION failed"); + SYSMSG("SNDRV_PCM_IOCTL_PVERSION failed (%i)", ret); close(fd); return ret; } @@ -1288,14 +1290,14 @@ fd = snd_open_device(filename, fmode); if (fd < 0) { ret = -errno; - SYSMSG("open %s failed", filename); + SYSMSG("open '%s' failed (%i)", filename, ret); goto _err; } if (subdevice >= 0) { memset(&info, 0, sizeof(info)); if (ioctl(fd, SNDRV_PCM_IOCTL_INFO, &info) < 0) { ret = -errno; - SYSMSG("SNDRV_PCM_IOCTL_INFO failed"); + SYSMSG("SNDRV_PCM_IOCTL_INFO failed (%i)", ret); goto _err; } if (info.subdevice != (unsigned int) subdevice) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_share.c new/alsa-lib-1.0.23/src/pcm/pcm_share.c --- old/alsa-lib-1.0.22/src/pcm/pcm_share.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_share.c 2010-04-16 13:11:05.000000000 +0200 @@ -1529,7 +1529,7 @@ pcm->private_data = share; pcm->poll_fd = share->client_socket; pcm->poll_events = stream == SND_PCM_STREAM_PLAYBACK ? POLLOUT : POLLIN; - pcm->monotonic = pcm->monotonic; + pcm->monotonic = slave->pcm->monotonic; snd_pcm_set_hw_ptr(pcm, &share->hw_ptr, -1, 0); snd_pcm_set_appl_ptr(pcm, &share->appl_ptr, -1, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/src/pcm/pcm_softvol.c new/alsa-lib-1.0.23/src/pcm/pcm_softvol.c --- old/alsa-lib-1.0.22/src/pcm/pcm_softvol.c 2009-12-16 16:18:51.000000000 +0100 +++ new/alsa-lib-1.0.23/src/pcm/pcm_softvol.c 2010-04-16 13:11:05.000000000 +0200 @@ -107,7 +107,8 @@ v.i = a; y.i = 0; #if __BYTE_ORDER == __LITTLE_ENDIAN - x.i = (unsigned int)v.s[0] * b; + x.i = (unsigned short)v.s[0]; + x.i *= b; y.s[0] = x.s[1]; y.i += (int)v.s[1] * b; #else @@ -135,6 +136,23 @@ return swap ? (int)bswap_32(fraction) : fraction; } +/* always little endian */ +static inline int MULTI_DIV_24(int a, unsigned int b) +{ + unsigned int gain = b >> VOL_SCALE_SHIFT; + int fraction; + fraction = MULTI_DIV_32x16(a, b & VOL_SCALE_MASK); + if (gain) { + long long amp = (long long)a * gain + fraction; + if (amp > (int)0x7fffff) + amp = (int)0x7fffff; + else if (amp < (int)0x800000) + amp = (int)0x800000; + return (int)amp; + } + return fraction; +} + static inline short MULTI_DIV_short(short a, unsigned int b, int swap) { unsigned int gain = b >> VOL_SCALE_SHIFT; @@ -223,7 +241,7 @@ tmp = src[0] | \ (src[1] << 8) | \ (((signed char *) src)[2] << 16); \ - tmp = MULTI_DIV_int(tmp, vol_scale, 0); \ + tmp = MULTI_DIV_24(tmp, vol_scale); \ dst[0] = tmp; \ dst[1] = tmp >> 8; \ dst[2] = tmp >> 16; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.22/version new/alsa-lib-1.0.23/version --- old/alsa-lib-1.0.22/version 2009-12-16 16:27:36.000000000 +0100 +++ new/alsa-lib-1.0.23/version 2010-04-16 13:17:58.000000000 +0200 @@ -1 +1 @@ -1.0.22 +1.0.23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 krb5 for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at Fri Apr 23 19:17:35 CEST 2010. -------- --- krb5/krb5-mini.changes 2010-04-14 15:15:17.000000000 +0200 +++ krb5/krb5-mini.changes 2010-04-23 19:12:38.649692000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 14 11:36:32 CEST 2010 - mc(a)suse.de + +- fix a double free vulnerability in the KDC + CVE-2010-1320, MITKRB5-SA-2010-004 (bnc#596002) + +------------------------------------------------------------------- krb5.changes: same change calling whatdependson for head-i586 New: ---- krb5-1.7-MITKRB5-SA-2010-004.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-doc.spec ++++++ --- /var/tmp/diff_new_pack.CpNrS2/_old 2010-04-23 19:12:53.000000000 +0200 +++ /var/tmp/diff_new_pack.CpNrS2/_new 2010-04-23 19:12:53.000000000 +0200 @@ -21,7 +21,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html texlive Version: 1.8.1 -Release: 1 +Release: 2 %define srcRoot krb5-1.8.1 Summary: MIT Kerberos5 Implementation--Documentation License: MIT License (or similar) ++++++ krb5-mini.spec ++++++ --- /var/tmp/diff_new_pack.CpNrS2/_old 2010-04-23 19:12:53.000000000 +0200 +++ /var/tmp/diff_new_pack.CpNrS2/_new 2010-04-23 19:12:53.000000000 +0200 @@ -28,7 +28,7 @@ BuildRequires: bison libcom_err-devel ncurses-devel BuildRequires: keyutils keyutils-devel Version: 1.8.1 -Release: 1 +Release: 2 %if ! 0%{?build_mini} BuildRequires: libopenssl-devel openldap2-devel # bug437293 @@ -47,14 +47,15 @@ Source2: baselibs.conf Source5: krb5-%{version}-rpmlintrc Source10: krb5-1.7-manpaths.txt -Patch2: krb5-1.6.1-compile_pie.dif -Patch20: krb5-1.6.3-kprop-use-mkstemp.dif -Patch30: krb5-1.7-manpaths.dif -Patch32: krb5-1.4.3-enospc.dif -Patch34: krb5-1.6.3-gssapi_improve_errormessages.dif -Patch41: krb5-1.6.3-kpasswd_tcp.patch -Patch44: krb5-1.6.3-ktutil-manpage.dif -Patch46: krb5-1.6.3-fix-ipv6-query.dif +Patch1: krb5-1.6.1-compile_pie.dif +Patch2: krb5-1.6.3-kprop-use-mkstemp.dif +Patch3: krb5-1.7-manpaths.dif +Patch4: krb5-1.4.3-enospc.dif +Patch5: krb5-1.6.3-gssapi_improve_errormessages.dif +Patch6: krb5-1.6.3-kpasswd_tcp.patch +Patch7: krb5-1.6.3-ktutil-manpage.dif +Patch8: krb5-1.6.3-fix-ipv6-query.dif +Patch9: krb5-1.7-MITKRB5-SA-2010-004.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %insserv_prereq %fillup_prereq @@ -194,14 +195,15 @@ %prep %setup -q -n %{srcRoot} %setup -a 1 -T -D -n %{srcRoot} +%patch1 %patch2 -%patch20 -%patch30 -p1 -%patch32 -p1 -%patch34 -p1 -%patch41 -%patch44 -p1 -%patch46 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 # Rename the man pages so that they'll get generated correctly. pushd src cat %{SOURCE10} | while read manpage ; do krb5.spec: same change ++++++ krb5-1.7-MITKRB5-SA-2010-004.dif ++++++ Index: krb5-1.8.1/src/kdc/do_tgs_req.c =================================================================== --- krb5-1.8.1.orig/src/kdc/do_tgs_req.c +++ krb5-1.8.1/src/kdc/do_tgs_req.c @@ -543,6 +543,7 @@ tgt_again: to the caller */ ticket_reply = *(header_ticket); enc_tkt_reply = *(header_ticket->enc_part2); + enc_tkt_reply.authorization_data = NULL; clear(enc_tkt_reply.flags, TKT_FLG_INVALID); } @@ -554,6 +555,7 @@ tgt_again: to the caller */ ticket_reply = *(header_ticket); enc_tkt_reply = *(header_ticket->enc_part2); + enc_tkt_reply.authorization_data = NULL; old_life = enc_tkt_reply.times.endtime - enc_tkt_reply.times.starttime; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-proto-devel for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory checked in at Fri Apr 23 19:11:27 CEST 2010. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2010-04-04 16:43:56.000000000 +0200 +++ xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2010-04-18 16:33:16.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 18 16:32:57 CEST 2010 - dmueller(a)suse.de + +- require python-base to disambiguate expansion + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.xN5wg7/_old 2010-04-23 19:10:47.000000000 +0200 +++ /var/tmp/diff_new_pack.xN5wg7/_new 2010-04-23 19:10:47.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: python-base Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 1 +Release: 2 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -65,7 +65,8 @@ Source35: vncproto-20070501.tar.bz2 Source36: xcliplistproto-20070501.tar.bz2 Source37: dri2proto-2.2.tar.bz2 -Requires: glibc-devel +Requires: glibc-devel python-base +%py_requires %description This package contains all necessary include files and libraries needed ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit file for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at Fri Apr 23 19:10:32 CEST 2010. -------- --- file/file.changes 2010-02-05 17:16:27.000000000 +0100 +++ file/file.changes 2010-04-19 16:19:23.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 19 16:18:08 CEST 2010 - werner(a)suse.de + +- Add llvm bicode magic (bnc#597752) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- file-5.04-llvm.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.FfInRb/_old 2010-04-23 19:10:16.000000000 +0200 +++ /var/tmp/diff_new_pack.FfInRb/_new 2010-04-23 19:10:16.000000000 +0200 @@ -31,7 +31,7 @@ # # Set Version also in python-magic.spec Version: 5.04 -Release: 1 +Release: 2 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Source2: baselibs.conf @@ -58,6 +58,7 @@ Patch26: file-4.24-solv.dif Patch27: file-5.04-zip2.0.dif Patch28: file-5.03-iso9660.dif +Patch29: file-5.04-llvm.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -122,6 +123,7 @@ %patch26 -p0 -b .solv %patch27 -p0 -b .zip2.0 %patch28 -p0 -b .iso9600 +%patch29 -p0 -b .llvm %patch %build ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.FfInRb/_old 2010-04-23 19:10:16.000000000 +0200 +++ /var/tmp/diff_new_pack.FfInRb/_new 2010-04-23 19:10:16.000000000 +0200 @@ -27,7 +27,7 @@ Group: Development/Languages/Python AutoReqProv: on Version: 5.04 -Release: 1 +Release: 2 Summary: Python module to use libmagic %py_requires Source99: file.spec ++++++ file-5.04-llvm.dif ++++++ --- magic/Magdir/llvm +++ magic/Magdir/llvm 2010-04-19 14:13:15.518924957 +0000 @@ -9,3 +9,6 @@ 0 string llvc0 LLVM byte-codes, null compression 0 string llvc1 LLVM byte-codes, gzip compression 0 string llvc2 LLVM byte-codes, bzip2 compression + +0 string BC\xc0\xde LLVM bitcode +0 string \xde\xc0\x17\x0b LLVM bitcode, wrapper ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libselinux for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '10

23 Apr '10

Hello community, here is the log from the commit of package libselinux for openSUSE:Factory checked in at Fri Apr 23 19:09:32 CEST 2010. -------- --- libselinux/libselinux.changes 2010-02-25 15:58:31.000000000 +0100 +++ libselinux/libselinux.changes 2010-04-09 09:28:10.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Apr 9 07:27:27 UTC 2010 - thomas(a)novell.com + +- selinux-ready: added function to check for restorecond in + runlevel 3/5 + +------------------------------------------------------------------- +Thu Apr 8 06:37:34 UTC 2010 - thomas(a)novell.com + +- selinux-ready: added functions for checking PAM config and + policy boolean init_upstart + +------------------------------------------------------------------- +Wed Apr 7 13:26:59 UTC 2010 - thomas(a)novell.com + +- selinux-ready: fixed init ramfs checking + +------------------------------------------------------------------- +Wed Apr 7 12:59:41 UTC 2010 - thomas(a)novell.com + +- added new selinux-ready script + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libselinux-bindings.spec ++++++ --- /var/tmp/diff_new_pack.NNnrKn/_old 2010-04-23 19:08:43.000000000 +0200 +++ /var/tmp/diff_new_pack.NNnrKn/_new 2010-04-23 19:08:43.000000000 +0200 @@ -23,7 +23,7 @@ Name: libselinux-bindings Version: 2.0.91 -Release: 1 +Release: 2 Url: http://www.nsa.gov/selinux/ License: GPLv2 ; Public Domain, Freeware Group: System/Libraries libselinux.spec: same change ++++++ selinux-ready ++++++ --- /var/tmp/diff_new_pack.NNnrKn/_old 2010-04-23 19:08:43.000000000 +0200 +++ /var/tmp/diff_new_pack.NNnrKn/_new 2010-04-23 19:08:43.000000000 +0200 @@ -22,7 +22,7 @@ check_filesystem() { FSPATH="/proc/filesystems" - FSNAME="selinuxfs" + FSNAME="securityfs" grep -w $FSNAME $FSPATH 1>&2 >/dev/null @@ -37,11 +37,11 @@ check_boot() { - BPARAM="security=selinux.*selinux=1.*enforcing=?" # XXX order not mandatory + BPARAM="selinux=1" printf "\tcheck_boot: Assuming GRUB as bootloader.\n" - BLINE=$(grep -E $BPARAM /boot/grub/menu.lst 2>/dev/null) # XXX check for multiple lines in config + BLINE=$(grep -- $BPARAM /boot/grub/menu.lst 2>/dev/null) # XXX check for multiple lines in config if [ $? == 0 ]; then K=$(echo $BLINE | awk -F' ' '{print $2}') @@ -80,18 +80,97 @@ cd initrd-extracted gunzip -c $TD/i.cpio.gz | cpio -i --force-local --no-absolute-filenames 2>/dev/null grep -E -- $MCMD boot/* 2>&1 >/dev/null - FLG=$? + FLG1=$? + grep -E -- load_policy boot/* 2>&1 >/dev/null + FLG2=$? popd 2>&1>/dev/null - if [ $FLG == 0 ];then + if [ $FLG1 == 0 -a $FLG2 == 0 ];then printf "\tcheck_mkinitrd: OK. Your initrd seems to be correct.\n" return 0 else printf "\tcheck_mkinitrd: ERR. Your initrd seems not to mount /proc of\n" - printf "\t the root filesystem during boot, this may be a\n" - printf "\t reason for SELinux not working.\n" + printf "\t the root filesystem during boot and/or load_policy\n" + printf "\t is missing,\n" + printf "\t this may be a reason for SELinux not working.\n" + return 1 + fi +} + +check_pam() +{ + AA_PAM=0 + SE_PAM=0 + + # test for AA pam module + grep apparmor /etc/pam.d/* 2>&1 >/dev/null + FLG=$? + if [ $FLG == 0 ]; then + AA_PAM=1 + fi + + # test for SELinux pam module + grep selinux /etc/pam.d/* 2>&1 >/dev/null + FLG=$? + if [ $FLG == 0 ]; then + SE_PAM=1 + fi + + # suggest config + if [ $SE_PAM == 1 ] && [ $AA_PAM == 0 ]; then + printf "\tcheck_pam: OK. Your PAM configuration seems to be correct.\n" + return 0 + fi + printf "\tcheck_pam: ERR. Your PAM configuration seems to be incorrect.\n" + if [ $AA_PAM == 1 ]; then + printf " execute 'pam-config -d --apparmor' as root\n" + fi + if [ $SE_PAM == 0 ]; then + printf " execute 'pam-config -a --selinux' as root\n" + fi + + return 1 +} + +check_initupstart() +{ + CFGFILE="/etc/selinux/config" + + if ! [ -f $CFGFILE ]; then + printf "\tcheck_initupstart: ERR. $CFGFILE does not exist.\n" + return 1; + fi + + POL=$(grep SELINUXTYPE $CFGFILE | sed "s/SELINUXTYPE\s*=\s*"//) + + if ! [ -f /etc/selinux/$POL/booleans ]; then + printf "\tcheck_initupstart: ERR. booleans file for policy $POL does not exist.\n" + return 1 + fi + + INITUS=$(grep init_upstart /etc/selinux/$POL/booleans | sed "s/.*init_upstart\s*=\s*//") + + if [ "$INITUS" == 1 ]; then + printf "\tcheck_initupstart: OK. init_upstart in $POL/booleans is set to 1.\n" + return 0 + else + printf "\tcheck_initupstart: ERR. init_upstart in $POL/booleans is NOT set to 1 ($INITUS).\n" return 1 fi + +} + +check_runlevel() +{ + #ls -q /etc/rc.d/rc[35].d/S*restorecond 1>&2 >/dev/null + + #if [ $? == 0 ]; then + if [ -x /etc/rc.d/rc3.d/S*restorecond ] || [ -x /etc/rc.d/rc5.d/S*restorecond ]; then + printf "\tcheck_runlevel: OK. your system is using restorecond in runlevel 3 and/or 5.\n" + return 0; + fi + printf "\tcheck_runlevel: ERR. please execute 'yast2 runlevel' and enable restorecond.\n" + return 1 } check_packages() @@ -120,8 +199,13 @@ { CF="/etc/selinux/config" + if [ -f $CF ];then printf "\tcheck_config: OK. Config file seems to be there.\n" + if ! [ $(stat --printf=%a $CF) -eq "644" ]; then + printf "\tcheck_config: ERR. Config file '$CF' has wrong permissions.\n" + return 1 + fi return 0 else printf "\tcheck_config: ERR. Config file '$CF' is missing.\n" @@ -138,6 +222,8 @@ check_mkinitrd check_packages check_config +check_initupstart +check_pam +check_runlevel rm -rf $TD - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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