July 2007 - openSUSE Commits - openSUSE Mailing Lists

commit kdebluetooth
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package kdebluetooth checked in at Mon Jul 30 21:27:55 CEST 2007. -------- --- KDE/kdebluetooth/kdebluetooth.changes 2007-07-16 17:58:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebluetooth/kdebluetooth.changes 2007-07-30 19:30:20.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 30 19:27:23 CEST 2007 - tpatzig(a)suse.de + +- update to kdebluetooth version 1.0-beta5 + * fixed crashes in the trayicon + * some kinputwizard bugfixes + +------------------------------------------------------------------- Old: ---- kdebluetooth-1.0-beta4.tar.bz2 New: ---- kdebluetooth-1.0_beta5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebluetooth.spec ++++++ --- /var/tmp/diff_new_pack.t12549/_old 2007-07-30 21:27:45.000000000 +0200 +++ /var/tmp/diff_new_pack.t12549/_new 2007-07-30 21:27:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebluetooth (Version 1.0_beta4) +# spec file for package kdebluetooth (Version 1.0_beta5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,11 +19,11 @@ License: GPL v2 or later Group: Hardware/Other Summary: Bluetooth Support for KDE -Version: 1.0_beta4 +Version: 1.0_beta5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build # svn2dist extragear-pim kdebluetooth -Source0: %name-1.0-beta4.tar.bz2 +Source0: %name-%version.tar.bz2 Source1: kbluetooth.default.sh Requires: bluez-utils Requires: obexftp @@ -34,25 +34,29 @@ %description To exchange files and data easily via Bluetooth. -* kbluetoothd--a tray applet to handle incoming inquiries +* kbluetooth--a tray applet to handle incoming inquiries -* kbtobexclient--to send files via bluetooth +* kbluemon--gui to discover remote devices -* kbtserialchat--a serial terminal for a bluetooth device +* kinputwizard--gui to setup bluetooth input devices -* irmsynckonnector--an irm kresource, especially useful for kitchensync +* kbluelock--locks the screen, when remote device disappears + +* obexftp--to send files via bluetooth Authors: -------- + Daniel Gollub <dgollub(a)suse.de> + Tom Patzig <tpatzig(a)suse.de> Mattia Merzi <merzi(a)itc.it> Fred Schaettgen <kdebluetooth(a)schaettgen.de> Simone Gotti <motaboy(a)libero.it> %lang_package %prep -%setup -q -n %name-1.0-beta4 +%setup -q -n %name-%version . /etc/opt/kde3/common_options update_admin # --no-unsermake @@ -129,6 +133,10 @@ /opt/kde3/env %changelog +* Mon Jul 30 2007 - tpatzig(a)suse.de +- update to kdebluetooth version 1.0-beta5 + * fixed crashes in the trayicon + * some kinputwizard bugfixes * Mon Jul 16 2007 - dgollub(a)suse.de - start kbluetooth on session startup if hcid is running - update to kdebluetooth version 1.0-beta4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 hostapd
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package hostapd checked in at Mon Jul 30 21:23:13 CEST 2007. -------- --- hostapd/hostapd.changes 2007-03-14 17:27:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/hostapd/hostapd.changes 2007-07-30 16:57:54.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Jul 30 16:57:16 CEST 2007 - jg(a)suse.de + +- update to version 0.5.8, changes: + * updated driver_devicescape.c to build with the current + wireless-dev.git tree and net/d80211 changes + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-03.txt) + * fixed EAP-MSCHAPv2 server to use a space between S and M parameters + in Success Request [Bug 203] + * added support for sending EAP-AKA Notifications in error cases + * RADIUS server: added support for processing duplicate messages + (retransmissions from RADIUS client) by replying with the previous + reply + +------------------------------------------------------------------- Old: ---- hostapd-0.5.7.tar.bz2 New: ---- hostapd-0.5.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hostapd.spec ++++++ --- /var/tmp/diff_new_pack.fc1820/_old 2007-07-30 21:20:41.000000000 +0200 +++ /var/tmp/diff_new_pack.fc1820/_new 2007-07-30 21:20:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hostapd (Version 0.5.7) +# spec file for package hostapd (Version 0.5.8) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,11 +15,11 @@ %ifarch %ix86 x86_64 BuildRequires: madwifi-devel %endif -Summary: Turns Your WLAN Card into an Access Point -Version: 0.5.7 +Summary: Turns Your WLAN Card into a WPA capable Access Point +Version: 0.5.8 Release: 1 -Group: Hardware/Other -License: GNU General Public License (GPL) +Group: Hardware/Wifi +License: BSD 3-Clause, GPL v2 or later, Dual licensed under GPL and BSD licence. BuildRoot: %{_tmppath}/%{name}-%{version}-build #Provides: #Requires: @@ -30,12 +30,12 @@ Patch: hostapd.dif %description -This is a Linux driver for wireless LAN cards based on Intersil's -Prism2/2.5 chipset. The driver supports a Host AP mode--it takes care -of IEEE 802.11 management functions in the host computer and acts as an -access point. This does not require any special firmware for the -wireless LAN card. In addition to this, it has some support for normal -station operations in BSS and possible also in IBSS. +hostapd is a user space daemon for access point and authentication +servers. It implements IEEE 802.11 access point management, IEEE +802.1X/WPA/WPA2/EAP Authenticators, RADIUS client, EAP server, and +RADIUS authentication server. Currently, hostapd supports HostAP, +madwifi, and prism54 drivers. It also supports wired IEEE 802.1X +authentication via any ethernet driver. @@ -73,6 +73,18 @@ %doc ChangeLog COPYING README madwifi.conf wired.conf %changelog +* Mon Jul 30 2007 - jg(a)suse.de +- update to version 0.5.8, changes: + * updated driver_devicescape.c to build with the current + wireless-dev.git tree and net/d80211 changes + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-03.txt) + * fixed EAP-MSCHAPv2 server to use a space between S and M parameters + in Success Request [Bug 203] + * added support for sending EAP-AKA Notifications in error cases + * RADIUS server: added support for processing duplicate messages + (retransmissions from RADIUS client) by replying with the previous + reply * Wed Mar 14 2007 - jg(a)suse.de - split off hostapd in its own package - update to version 0.5.7, changes (shortened): ++++++ hostapd-0.5.7.tar.bz2 -> hostapd-0.5.8.tar.bz2 ++++++ ++++ 3169 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 gnome-volume-manager
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package gnome-volume-manager checked in at Mon Jul 30 21:18:04 CEST 2007. -------- --- GNOME/gnome-volume-manager/gnome-volume-manager.changes 2007-01-29 17:20:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-volume-manager/gnome-volume-manager.changes 2007-07-30 19:28:47.919882000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 30 19:27:01 CEST 2007 - crivera(a)suse.de + +- Add gnome-volume-manager-printer-notify.patch. This patch + adds support for checking for properties set on printer + devices by cups-autoconfig. It uses libnotify to inform the users + that a new printer was configured if these properties are set. + +------------------------------------------------------------------- New: ---- gnome-volume-manager-printer-notify.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-volume-manager.spec ++++++ --- /var/tmp/diff_new_pack.x28439/_old 2007-07-30 21:16:33.000000000 +0200 +++ /var/tmp/diff_new_pack.x28439/_new 2007-07-30 21:16:33.000000000 +0200 @@ -13,10 +13,10 @@ Name: gnome-volume-manager BuildRequires: gnutls-devel intltool libglade2-devel libgnomeprintui-devel libnotify-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser update-desktop-files Version: 2.17.0 -Release: 19 +Release: 73 URL: http://www.gnome.org/ Group: System/GUI/GNOME -License: GNU General Public License (GPL) +License: GPL v2 or later Summary: The GNOME Volume Manager Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.b… Source1: gnome-cdda-handler @@ -25,6 +25,7 @@ Patch0: gvm-schema-defaults.patch Patch1: suse-autorun.patch Patch2: 153241.patch +Patch3: gnome-volume-manager-printer-notify.patch %if %suse_version > 1000 Recommends: control-center2 %else @@ -59,6 +60,7 @@ %patch %patch1 %patch2 +%patch3 -p1 %build autoreconf -f -i @@ -105,7 +107,12 @@ # FIXME: Directory ownership: Should be owned by core GNOME package %dir %{_datadir}/gnome/autostart -%changelog -n gnome-volume-manager +%changelog +* Mon Jul 30 2007 - crivera(a)suse.de +- Add gnome-volume-manager-printer-notify.patch. This patch + adds support for checking for properties set on printer + devices by cups-autoconfig. It uses libnotify to inform the users + that a new printer was configured if these properties are set. * Mon Jan 29 2007 - sbrabec(a)suse.cz - Removed remaining references to /opt/gnome. * Wed Jan 17 2007 - sbrabec(a)suse.cz ++++++ gnome-volume-manager-printer-notify.patch ++++++ diff -ur /usr/src/packages/BUILD/gnome-volume-manager-2.17.0/src/manager.c ./src/manager.c --- /usr/src/packages/BUILD/gnome-volume-manager-2.17.0/src/manager.c 2007-07-30 12:45:26.000000000 -0400 +++ ./src/manager.c 2007-07-30 12:45:23.000000000 -0400 @@ -96,6 +96,7 @@ static void statfs_mount_info_remove (const char *udi); static void statfs_mount_info_free (statfs_mount_info *info); static gboolean gvm_statfs_check_space (const char *udi, statfs_mount_info *info, gpointer user_data); +static void show_printer_notification (const char *title, const char *message); #endif static gboolean gvm_dbus_init (void); @@ -2523,9 +2524,21 @@ static gboolean printer_device_added (const char *udi, const char *capability __attribute__((__unused__))) { + if (libhal_device_get_property_bool (hal_ctx, udi, "printer.configured", NULL)) { + char *display_name = libhal_device_get_property_string (hal_ctx, udi, + "printer.display_name", NULL); + gchar *msg = g_strdup_printf (_("%s has been configured."), display_name); +#ifdef ENABLE_NOTIFY + show_printer_notification (_("New Printer"), display_name); +#endif + libhal_free_string (display_name); + g_free (msg); + return TRUE; + } + if (config.autoprinter) gvm_run_printer (udi); - + return TRUE; } @@ -2811,6 +2824,17 @@ return TRUE; } +#if ENABLE_NOTIFY +static void +show_printer_notification (const char *title, const char *message) +{ + NotifyNotification *n; + n = notify_notification_new (title, message, "gnome-dev-printer", NULL); + notify_notification_show (n, NULL); + g_object_unref (n); +} +#endif + static DBusHandlerResult gvm_dbus_filter_function (DBusConnection *connection, DBusMessage *message, void *user_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 php5
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package php5 checked in at Mon Jul 30 21:15:30 CEST 2007. -------- --- php5/php5.changes 2007-07-25 10:16:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2007-07-30 18:05:03.000000000 +0200 @@ -1,0 +2,40 @@ +Mon Jul 30 15:31:19 CEST 2007 - mmarek(a)suse.cz + +- updated to latest state of PHP_5_2 branch; highlights from the + NEWS file: + - Upgraded PCRE to version 7.2 (Nuno) + - Updated timezone database to version 2007.6. (Derick) + - Improved openssl_x509_parse() to return extensions in readable + form. (Dmitry) + - Changed "display_errors" php.ini option to accept "stderr" as + value which makes the error messages to be outputted to STDERR + instead of STDOUT with CGI and CLI SAPIs (FR #22839). (Jani) + - Changed error handler to send HTTP 500 instead of blank page on + PHP errors. (Dmitry, Andrei Nigmatulin) + - Added check for unknown options passed to configure. (Jani) + - Added persistent connection status checker to pdo_pgsql. + (Elvis Pranskevichus, Ilia) + - Added support for ATTR_TIMEOUT inside pdo_pgsql driver. (Ilia) + - Added php_ini_loaded_file() function which returns the path to + the actual php.ini in use. (Jani) + - Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION + GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING. + (Pierre) + - Added missing open_basedir checks to CGI. (anight at + eyelinkmedia dot com, Tony) + - Added missing format validator to unpack() function. (Ilia) + - Added missing error check inside bcpowmod(). (Ilia) + - Added CURLOPT_PRIVATE & CURLINFO_PRIVATE constants. (Andrey A. + Belashkov, Tony) + - Added missing MSG_EOR and MSG_EOF constants to sockets + extension. (Jani) + - Added PCRE_VERSION constant. (Tony) + - Added ReflectionExtension::info() function to print the + phpinfo() block for an extension. (Johannes) + - Implemented FR #41884 (ReflectionClass::getDefaultProperties() + does not handle static attributes). (Tony) + - plus lots of bugfixes +- fixed the pear phar archive to run with 5.2.4 + [http://bugs.php.net/bug.php?id=42146] + +------------------------------------------------------------------- Old: ---- php5-cgi-missing-openbasedir.patch php5-corrected-CVE-2007-2872.patch php5-phpbug39330.patch php5-ze2-fixes.patch suhosin-patch-5.2.3-0.9.6.2.patch.gz New: ---- install-pear-nozlib.phar.patch PHP_5_2-CVS-2007-07-30.patch.bz2 suhosin-patch-5.2.3-0.9.6.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.P24254/_old 2007-07-30 21:14:44.000000000 +0200 +++ /var/tmp/diff_new_pack.P24254/_new 2007-07-30 21:14:44.000000000 +0200 @@ -69,7 +69,7 @@ ### ### Version: 5.2.3 -Release: 9 +Release: 13 License: The PHP License, version 3.01 Group: Development/Languages/Other Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter @@ -84,6 +84,8 @@ Source4: README.SUSE-pear #until it gets fixed in upstream... Source5: Registry.php +# update to PHP_5_2 CVS (future 5.2.4) +Patch0: PHP_5_2-CVS-2007-07-30.patch.bz2 #SUSE specific stuff Patch1: php5-config.patch Patch2: php5-phpize.patch @@ -92,19 +94,14 @@ #home made hack to really build against libedit Patch5: php5-really-with-libedit.patch %if %{with_suhosin_patch} -Patch6: suhosin-patch-%{version}-%{suhosin_patch_version}.patch.gz +Patch6: suhosin-patch-%{version}-%{suhosin_patch_version}.patch %endif #bugs +Patch7: install-pear-nozlib.phar.patch Patch8: php5-really-norpath.patch # compiler warnings Patch9: php5-warnings.patch -#old bug in apache2 module -Patch10: php5-phpbug39330.patch -#various fixes -Patch11: php5-ze2-fixes.patch #please use patch30 and up for security fixes -Patch30: php5-corrected-CVE-2007-2872.patch -Patch31: php5-cgi-missing-openbasedir.patch URL: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -1107,6 +1104,7 @@ %{__tar} xf %{S:2} -C ext %{__mv} ext/suhosin-%{suhosin_version} ext/suhosin %{__cp} %{S:4} pear/README.SUSE +%patch0 -p1 %patch1 %patch2 %patch3 -p1 @@ -1115,12 +1113,9 @@ %if %{with_suhosin_patch} %patch6 -p1 %endif +%patch7 %patch8 -p1 %patch9 -%patch10 -%patch11 -%patch30 -%patch31 # we build three SAPI %{__mkdir_p} build-apache2 %{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi @@ -1805,6 +1800,43 @@ %config(noreplace) %{php_sysconf}/conf.d/zlib.ini %changelog +* Mon Jul 30 2007 - mmarek(a)suse.cz +- updated to latest state of PHP_5_2 branch; highlights from the + NEWS file: + - Upgraded PCRE to version 7.2 (Nuno) + - Updated timezone database to version 2007.6. (Derick) + - Improved openssl_x509_parse() to return extensions in readable + form. (Dmitry) + - Changed "display_errors" php.ini option to accept "stderr" as + value which makes the error messages to be outputted to STDERR + instead of STDOUT with CGI and CLI SAPIs (FR #22839). (Jani) + - Changed error handler to send HTTP 500 instead of blank page on + PHP errors. (Dmitry, Andrei Nigmatulin) + - Added check for unknown options passed to configure. (Jani) + - Added persistent connection status checker to pdo_pgsql. + (Elvis Pranskevichus, Ilia) + - Added support for ATTR_TIMEOUT inside pdo_pgsql driver. (Ilia) + - Added php_ini_loaded_file() function which returns the path to + the actual php.ini in use. (Jani) + - Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION + GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING. + (Pierre) + - Added missing open_basedir checks to CGI. (anight at + eyelinkmedia dot com, Tony) + - Added missing format validator to unpack() function. (Ilia) + - Added missing error check inside bcpowmod(). (Ilia) + - Added CURLOPT_PRIVATE & CURLINFO_PRIVATE constants. (Andrey A. + Belashkov, Tony) + - Added missing MSG_EOR and MSG_EOF constants to sockets + extension. (Jani) + - Added PCRE_VERSION constant. (Tony) + - Added ReflectionExtension::info() function to print the + phpinfo() block for an extension. (Johannes) + - Implemented FR #41884 (ReflectionClass::getDefaultProperties() + does not handle static attributes). (Tony) + - plus lots of bugfixes +- fixed the pear phar archive to run with 5.2.4 + [http://bugs.php.net/bug.php?id=42146] * Wed Jul 25 2007 - mmarek(a)suse.cz - added /var/lib/pear to php5-pear.rpm * Tue Jul 24 2007 - judas_iscariote(a)shorewall.net ++++++ install-pear-nozlib.phar.patch ++++++ --- pear/install-pear-nozlib.phar +++ pear/install-pear-nozlib.phar @@ -536,7 +536,7 @@ // 4 = flags // 5 = metadata length $ret['manifest'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($manifest, $start, 24))); - $ret['manifest'][$savepath][3] = sprintf('%u', $ret['manifest'][$savepath][3]); + $ret['manifest'][$savepath][3] = sprintf('%u', $ret['manifest'][$savepath][3] & 0xffffffff); if ($ret['manifest'][$savepath][5]) { $ret['manifest'][$savepath][6] = unserialize(substr($manifest, $start + 24, $ret['manifest'][$savepath][5])); @@ -659,7 +659,7 @@ return array("Not valid internal .phar file (size error {$size} != " . $this->currentStat[7] . ")"); } - if (self::$_manifest[$this->_archiveName][$path][3] != sprintf("%u", crc32($data))) { + if (self::$_manifest[$this->_archiveName][$path][3] != sprintf("%u", crc32($data) & 0xffffffff)) { return array("Not valid internal .phar file (checksum error)"); } self::$_manifest[$this->_archiveName][$path]['ok'] = true; @@ -1108,7 +1108,7 @@ } }} if (!class_exists('Phar')) { - PHP_Archive::mapPhar(null, 42114 ); + PHP_Archive::mapPhar(null, 42140 ); } else { try { Phar::mapPhar(); ++++++ PHP_5_2-CVS-2007-07-30.patch.bz2 ++++++ ++++ 195744 lines (skipped) ++++++ php5-apache_sapi_install.patch ++++++ --- /var/tmp/diff_new_pack.P24254/_old 2007-07-30 21:14:44.000000000 +0200 +++ /var/tmp/diff_new_pack.P24254/_new 2007-07-30 21:14:44.000000000 +0200 @@ -1,8 +1,12 @@ # Do not attempt to modify apache configuration on module install ================================================================================ ---- php-5.1.2/sapi/apache2handler/config.m4 -+++ php-5.1.2/sapi/apache2handler/config.m4 -@@ -65,18 +65,9 @@ +--- + sapi/apache2handler/config.m4 | 9 --------- + 1 file changed, 9 deletions(-) + +--- php-5.2.3.orig/sapi/apache2handler/config.m4 ++++ php-5.2.3/sapi/apache2handler/config.m4 +@@ -68,18 +68,9 @@ if test "$PHP_APXS2" != "no"; then fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++++++ php5-config.patch ++++++ --- /var/tmp/diff_new_pack.P24254/_old 2007-07-30 21:14:44.000000000 +0200 +++ /var/tmp/diff_new_pack.P24254/_new 2007-07-30 21:14:44.000000000 +0200 @@ -1,6 +1,10 @@ ---- php.ini-recommended +--- + php.ini-recommended | 307 ++-------------------------------------------------- + 1 file changed, 15 insertions(+), 292 deletions(-) + +--- php.ini-recommended.orig +++ php.ini-recommended -@@ -241,7 +241,9 @@ safe_mode_allowed_env_vars = PHP_ +@@ -244,7 +244,9 @@ safe_mode_allowed_env_vars = PHP_ ; This directive contains a comma-delimited list of environment variables that ; the end user won't be able to change using putenv(). These variables will be ; protected even if safe_mode_allowed_env_vars is set to allow to change them. @@ -11,7 +15,7 @@ ; open_basedir, if set, limits all file operations to the defined directory ; and below. This directive makes most sense if used in a per-directory -@@ -390,7 +392,7 @@ track_errors = Off +@@ -406,7 +408,7 @@ track_errors = Off ; Disable the inclusion of HTML tags in error messages. ; Note: Never use this feature for production boxes. @@ -20,7 +24,7 @@ ; If html_errors is set On PHP produces clickable error messages that direct ; to a page describing the error or function causing the error in detail. -@@ -500,7 +502,7 @@ default_mimetype = "text/html" +@@ -516,7 +518,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -29,7 +33,7 @@ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -517,12 +519,12 @@ doc_root = +@@ -533,12 +535,12 @@ doc_root = user_dir = ; Directory in which the loadable extensions (modules) reside. @@ -44,7 +48,7 @@ ; cgi.force_redirect is necessary to provide security running PHP as a CGI under ; most web servers. Left undefined, PHP turns this on by default. You can -@@ -567,7 +569,7 @@ file_uploads = On +@@ -591,7 +593,7 @@ file_uploads = On ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). @@ -53,7 +57,7 @@ ; Maximum allowed size for uploaded files. upload_max_filesize = 2M -@@ -599,81 +601,6 @@ default_socket_timeout = 60 +@@ -623,81 +625,6 @@ default_socket_timeout = 60 ; fgets() and file() will work regardless of the source of the file. ; auto_detect_line_endings = Off @@ -135,7 +139,7 @@ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -715,12 +642,6 @@ default_socket_timeout = 60 +@@ -745,12 +672,6 @@ default_socket_timeout = 60 define_syslog_variables = Off [mail function] @@ -148,7 +152,7 @@ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -739,7 +660,7 @@ sql.safe_mode = Off +@@ -769,7 +690,7 @@ sql.safe_mode = Off ;odbc.default_pw = Not yet implemented ; Allow or prevent persistent links. @@ -157,7 +161,7 @@ ; Check that a connection is still valid before reuse. odbc.check_persistent = On -@@ -761,7 +682,7 @@ odbc.defaultbinmode = 1 +@@ -791,7 +712,7 @@ odbc.defaultbinmode = 1 [MySQL] ; Allow or prevent persistent links. @@ -166,7 +170,7 @@ ; Maximum number of persistent links. -1 means no limit. mysql.max_persistent = -1 -@@ -830,50 +751,9 @@ mysqli.default_pw = +@@ -860,50 +781,9 @@ mysqli.default_pw = ; Allow or prevent reconnect mysqli.reconnect = Off @@ -218,7 +222,7 @@ ; Detect broken persistent links always with pg_pconnect(). ; Auto reset feature requires a little overheads. -@@ -893,47 +773,6 @@ pgsql.ignore_notice = 0 +@@ -923,47 +803,6 @@ pgsql.ignore_notice = 0 ; Unless pgsql.ignore_notice=0, module cannot log notice message. pgsql.log_notice = 0 @@ -266,7 +270,7 @@ [bcmath] ; Number of decimal digits for all bcmath functions. bcmath.scale = 0 -@@ -941,43 +780,6 @@ bcmath.scale = 0 +@@ -971,43 +810,6 @@ bcmath.scale = 0 [browscap] ;browscap = extra/browscap.ini @@ -310,7 +314,7 @@ [Session] ; Handler used to store/retrieve data. session.save_handler = files -@@ -1008,7 +810,7 @@ session.save_handler = files +@@ -1038,7 +840,7 @@ session.save_handler = files ; ; where MODE is the octal representation of the mode. Note that this ; does not overwrite the process's umask. @@ -319,7 +323,7 @@ ; Whether to use cookies. session.use_cookies = 1 -@@ -1017,7 +819,7 @@ session.use_cookies = 1 +@@ -1047,7 +849,7 @@ session.use_cookies = 1 ; This option enables administrators to make their users invulnerable to ; attacks which involve passing session ids in URLs; defaults to 0. @@ -328,7 +332,7 @@ ; Name of the session (used as cookie name). session.name = PHPSESSID -@@ -1035,7 +837,7 @@ session.cookie_path = / +@@ -1065,7 +867,7 @@ session.cookie_path = / session.cookie_domain = ; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. @@ -337,7 +341,7 @@ ; Handler used to serialize data. php is the standard serializer of PHP. session.serialize_handler = php -@@ -1106,7 +908,7 @@ session.use_trans_sid = 0 +@@ -1136,7 +938,7 @@ session.use_trans_sid = 0 ; Select a hash function ; 0: MD5 (128 bits) ; 1: SHA-1 (160 bits) @@ -346,7 +350,7 @@ ; Define how many bits are stored in each character when converting ; the binary hash data to something readable. -@@ -1123,58 +925,6 @@ session.hash_bits_per_character = 5 +@@ -1153,58 +955,6 @@ session.hash_bits_per_character = 5 ; Note that all valid entries require a "=", even if no value follows. url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" @@ -405,7 +409,7 @@ [Assertion] ; Assert(expr); active by default. ;assert.active = On -@@ -1192,18 +942,6 @@ mssql.secure_connection = Off +@@ -1222,18 +972,6 @@ mssql.secure_connection = Off ; error_reporting(0) around the eval(). ;assert.quiet_eval = 0 @@ -424,7 +428,7 @@ [mbstring] ; language for internal character representation. ;mbstring.language = Japanese -@@ -1248,21 +986,6 @@ mssql.secure_connection = Off +@@ -1278,21 +1016,6 @@ mssql.secure_connection = Off ; enable strict encoding detection. ;mbstring.strict_encoding = Off ++++++ php5-php-config.patch ++++++ --- /var/tmp/diff_new_pack.P24254/_old 2007-07-30 21:14:44.000000000 +0200 +++ /var/tmp/diff_new_pack.P24254/_new 2007-07-30 21:14:44.000000000 +0200 @@ -1,16 +1,15 @@ -Index: scripts/php-config.in -=================================================================== -RCS file: /repository/php-src/scripts/php-config.in,v -retrieving revision 1.3.2.2.2.2 -diff -u -r1.3.2.2.2.2 php-config.in ---- scripts/php-config.in 27 Jul 2006 08:53:16 -0000 1.3.2.2.2.2 -+++ scripts/php-config.in 14 Aug 2006 04:16:34 -0000 -@@ -4,7 +4,7 @@ +--- + scripts/php-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- scripts/php-config.in ++++ scripts/php-config.in +@@ -5,7 +5,7 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" version="@PHP_VERSION@" - version_id="@PHP_VERSION_ID@" --includedir="@includedir@/php" -+includedir="@includedir@/php5" - includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib" + vernum="@PHP_VERSION_ID@" +-include_dir="@includedir@/php" ++include_dir="@includedir@/php5" + includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib" ldflags="@PHP_LDFLAGS@" libs="@EXTRA_LIBS@" ++++++ php5-phpize.patch ++++++ --- /var/tmp/diff_new_pack.P24254/_old 2007-07-30 21:14:44.000000000 +0200 +++ /var/tmp/diff_new_pack.P24254/_new 2007-07-30 21:14:44.000000000 +0200 @@ -1,4 +1,9 @@ ---- scripts/Makefile.frag +--- + scripts/Makefile.frag | 4 ++-- + scripts/phpize.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- scripts/Makefile.frag.orig +++ scripts/Makefile.frag @@ -3,8 +3,8 @@ # Build environment install @@ -11,7 +16,7 @@ BUILD_FILES = \ scripts/phpize.m4 \ ---- scripts/phpize.in +--- scripts/phpize.in.orig +++ scripts/phpize.in @@ -3,8 +3,8 @@ # Variable declaration @@ -22,5 +27,5 @@ +phpdir="`eval echo @datadir@`/build" +includedir="`eval echo @includedir@`/php5" builddir="`pwd`" + SED="@SED@" - FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" ++++++ php5-really-norpath.patch ++++++ --- /var/tmp/diff_new_pack.P24254/_old 2007-07-30 21:14:44.000000000 +0200 +++ /var/tmp/diff_new_pack.P24254/_new 2007-07-30 21:14:44.000000000 +0200 @@ -1,9 +1,13 @@ Really don't enable any RPATHs if --disable-rpath is given. ---- php-5.0.4/acinclude.m4.norpath -+++ php-5.0.4/acinclude.m4 -@@ -833,6 +833,7 @@ +--- + acinclude.m4 | 5 +++++ + 1 file changed, 5 insertions(+) + +--- php-5.2.3.orig/acinclude.m4 ++++ php-5.2.3/acinclude.m4 +@@ -429,6 +429,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[ dnl internal, don't use AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[ PHP_RUN_ONCE(LIBPATH, $1, [ @@ -11,7 +15,7 @@ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1" LDFLAGS="$LDFLAGS -L$1" PHP_RPATHS="$PHP_RPATHS $1" -@@ -852,7 +853,11 @@ +@@ -447,7 +448,11 @@ AC_DEFUN([PHP_ADD_LIBPATH],[ _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) ],[ if test "$ext_shared" = "yes"; then ++++++ suhosin-patch-5.2.3-0.9.6.2.patch ++++++ --- /var/tmp/diff_new_pack.P24254/_old 2007-07-30 21:14:45.000000000 +0200 +++ /var/tmp/diff_new_pack.P24254/_new 2007-07-30 21:14:45.000000000 +0200 @@ -1,3 +1,4 @@ +modified by mmarek: main/fopen_wrappers.c, hunk #2 is already integrated diff -Nura php-5.2.3/configure suhosin-patch-5.2.3-0.9.6.2/configure --- php-5.2.3/configure 2007-05-30 20:50:52.000000000 +0200 +++ suhosin-patch-5.2.3-0.9.6.2/configure 2007-06-01 11:07:20.000000000 +0200 @@ -185,29 +186,7 @@ } path_len = strlen(resolved_name); -@@ -172,14 +172,20 @@ - } - } - -+ resolved_name_len = strlen(resolved_name); - if (path_tmp[path_len - 1] == PHP_DIR_SEPARATOR) { -- resolved_name_len = strlen(resolved_name); - if (resolved_name[resolved_name_len - 1] != PHP_DIR_SEPARATOR) { - resolved_name[resolved_name_len] = PHP_DIR_SEPARATOR; - resolved_name[++resolved_name_len] = '\0'; - } - } - -+ if (resolved_name_len == resolved_basedir_len - 1) { -+ if (resolved_basedir[resolved_basedir_len - 1] == PHP_DIR_SEPARATOR) { -+ resolved_basedir_len--; -+ } -+ } -+ - /* Check the path */ - #if defined(PHP_WIN32) || defined(NETWARE) - if (strncasecmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) { -@@ -193,7 +199,7 @@ +@@ -193,7 +193,7 @@ } } else { /* Unable to resolve the real path, return -1 */ @@ -216,7 +195,7 @@ } } /* }}} */ -@@ -212,22 +218,44 @@ +@@ -212,22 +212,44 @@ char *pathbuf; char *ptr; char *end; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ocrad
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package ocrad checked in at Mon Jul 30 21:05:00 CEST 2007. -------- --- ocrad/ocrad.changes 2006-10-23 10:25:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/ocrad/ocrad.changes 2007-07-30 18:25:22.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jul 30 18:24:49 CEST 2007 - freitag(a)suse.de + +* Version 0.17 released. +* License updated to GPL version 3 or later. +* `--scale' no more suppresses ORF output. +* Improved removal of thick frames. +* Changed `Textline' to accept more than one big initial. +* Class `Block' renamed to `Blob'. +* `configure' and `Makefile.in' have been modified to be more + GNU-standards compliant. + +------------------------------------------------------------------- Old: ---- ocrad-0.16.tar.bz2 New: ---- ocrad-0.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocrad.spec ++++++ --- /var/tmp/diff_new_pack.AB5407/_old 2007-07-30 21:02:23.000000000 +0200 +++ /var/tmp/diff_new_pack.AB5407/_new 2007-07-30 21:02:23.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ocrad (Version 0.16) +# spec file for package ocrad (Version 0.17) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,12 +14,12 @@ BuildRequires: gcc-c++ URL: https://savannah.gnu.org/projects/ocrad/ Summary: GNU Ocrad--Optical Character Recognition Program -Version: 0.16 +Version: 0.17 Release: 1 Group: Productivity/Graphics/Other #Requires: #Provides: -License: GNU General Public License (GPL) - all versions +License: GPL v2 or later # URL: Source0: ocrad-%{version}.tar.bz2 # Patch: ocrad-%{version}.dif @@ -73,7 +73,16 @@ %doc examples # spec file ends here -%changelog -n ocrad +%changelog +* Mon Jul 30 2007 - freitag(a)suse.de + * Version 0.17 released. + * License updated to GPL version 3 or later. + * `--scale' no more suppresses ORF output. + * Improved removal of thick frames. + * Changed `Textline' to accept more than one big initial. + * Class `Block' renamed to `Blob'. + * `configure' and `Makefile.in' have been modified to be more + GNU-standards compliant. * Mon Oct 23 2006 - freitag(a)suse.de - update to version 0.16: * Version 0.16 released. ++++++ ocrad-0.16.tar.bz2 -> ocrad-0.17.tar.bz2 ++++++ ++++ 6360 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 patterns-openSUSE
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package patterns-openSUSE checked in at Mon Jul 30 21:00:47 CEST 2007. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2007-07-30 16:53:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2007-07-30 20:57:02.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 30 20:56:48 CEST 2007 - coolo(a)suse.de + +- also add recommends to the opt patterns + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.YOB753/_old 2007-07-30 21:00:32.000000000 +0200 +++ /var/tmp/diff_new_pack.YOB753/_new 2007-07-30 21:00:32.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: Patterns for Installation (full ftp tree) Version: 10.3 -Release: 85 +Release: 86 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 Source1: preprocess @@ -276,6 +276,8 @@ %changelog * Mon Jul 30 2007 - coolo(a)suse.de +- also add recommends to the opt patterns +* Mon Jul 30 2007 - coolo(a)suse.de - move packages on CD back out of opt * Fri Jul 27 2007 - coolo(a)suse.de - split several patterns into the required packages and ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/imaging/recommends new/patterns-openSUSE-data/toinstall/imaging/recommends --- old/patterns-openSUSE-data/toinstall/imaging/recommends 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/imaging/recommends 2007-07-30 20:55:57.000000000 +0200 @@ -0,0 +1 @@ +imaging_opt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/imaging_opt/category new/patterns-openSUSE-data/toinstall/imaging_opt/category --- old/patterns-openSUSE-data/toinstall/imaging_opt/category 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/imaging_opt/category 2007-07-30 20:55:23.000000000 +0200 @@ -0,0 +1 @@ +addon diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/imaging_opt/icon new/patterns-openSUSE-data/toinstall/imaging_opt/icon --- old/patterns-openSUSE-data/toinstall/imaging_opt/icon 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/imaging_opt/icon 2007-07-30 20:55:23.000000000 +0200 @@ -0,0 +1 @@ +package_graphics diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/imaging_opt/order new/patterns-openSUSE-data/toinstall/imaging_opt/order --- old/patterns-openSUSE-data/toinstall/imaging_opt/order 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/imaging_opt/order 2007-07-30 20:55:23.000000000 +0200 @@ -0,0 +1 @@ +1810 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/imaging_opt/requires new/patterns-openSUSE-data/toinstall/imaging_opt/requires --- old/patterns-openSUSE-data/toinstall/imaging_opt/requires 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/imaging_opt/requires 2007-07-30 20:55:23.000000000 +0200 @@ -0,0 +1 @@ +x11 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/imaging_opt/role new/patterns-openSUSE-data/toinstall/imaging_opt/role --- old/patterns-openSUSE-data/toinstall/imaging_opt/role 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/imaging_opt/role 2007-07-30 20:55:23.000000000 +0200 @@ -0,0 +1 @@ +Desktop Functions diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/imaging_opt/sel new/patterns-openSUSE-data/toinstall/imaging_opt/sel --- old/patterns-openSUSE-data/toinstall/imaging_opt/sel 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/imaging_opt/sel 2007-07-30 20:55:23.000000000 +0200 @@ -0,0 +1 @@ +IMAGE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/imaging_opt/visible new/patterns-openSUSE-data/toinstall/imaging_opt/visible --- old/patterns-openSUSE-data/toinstall/imaging_opt/visible 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/imaging_opt/visible 2007-07-30 20:56:06.000000000 +0200 @@ -0,0 +1 @@ +false diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging/recommends new/patterns-openSUSE-data/toinstall/kde_imaging/recommends --- old/patterns-openSUSE-data/toinstall/kde_imaging/recommends 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging/recommends 2007-07-30 20:55:47.000000000 +0200 @@ -0,0 +1 @@ +kde_imaging_opt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/category new/patterns-openSUSE-data/toinstall/kde_imaging_opt/category --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/category 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/category 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +addon diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/extends new/patterns-openSUSE-data/toinstall/kde_imaging_opt/extends --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/extends 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/extends 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +imaging diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/freshens new/patterns-openSUSE-data/toinstall/kde_imaging_opt/freshens --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/freshens 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/freshens 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +kde diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/icon new/patterns-openSUSE-data/toinstall/kde_imaging_opt/icon --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/icon 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/icon 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +package_graphics diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/order new/patterns-openSUSE-data/toinstall/kde_imaging_opt/order --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/order 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/order 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +3005 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/requires new/patterns-openSUSE-data/toinstall/kde_imaging_opt/requires --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/requires 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/requires 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +kde_basis diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/role new/patterns-openSUSE-data/toinstall/kde_imaging_opt/role --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/role 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/role 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +KDE Desktop diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/sel new/patterns-openSUSE-data/toinstall/kde_imaging_opt/sel --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/sel 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/sel 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +KDE-IMAGE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/supplements new/patterns-openSUSE-data/toinstall/kde_imaging_opt/supplements --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/supplements 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/supplements 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +imaging diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/kde_imaging_opt/visible new/patterns-openSUSE-data/toinstall/kde_imaging_opt/visible --- old/patterns-openSUSE-data/toinstall/kde_imaging_opt/visible 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/kde_imaging_opt/visible 2007-07-30 20:55:17.000000000 +0200 @@ -0,0 +1 @@ +false ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 procinfo
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package procinfo checked in at Mon Jul 30 21:00:12 CEST 2007. -------- --- procinfo/procinfo.changes 2007-06-05 14:50:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/procinfo/procinfo.changes 2007-07-30 17:11:18.228334000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 30 17:09:25 CEST 2007 - werner(a)suse.de + +- During time delay calculation cast result not parts to float and + avoid sprint overflows (bug #295501) + +------------------------------------------------------------------- New: ---- procinfo-float.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procinfo.spec ++++++ --- /var/tmp/diff_new_pack.t29342/_old 2007-07-30 20:58:51.000000000 +0200 +++ /var/tmp/diff_new_pack.t29342/_new 2007-07-30 20:58:51.000000000 +0200 @@ -13,11 +13,11 @@ Name: procinfo BuildRequires: ncurses-devel URL: ftp://ftp.cistron.nl/pub/people/svm/ -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/Monitoring Autoreqprov: on Version: 18 -Release: 104 +Release: 116 Summary: Display System Status Gathered from /proc Provides: ps:/usr/bin/lsdev Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2 @@ -31,6 +31,7 @@ Patch7: procinfo-loadavg.dif Patch8: procinfo-lsdev.dif Patch9: procinfo-socklist.dif +Patch10: procinfo-float.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,6 +56,7 @@ %patch7 %patch8 %patch9 +%patch10 %build CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${RPM_OPT_FLAGS} -pipe" @@ -79,6 +81,9 @@ %{_mandir}/man8/socklist.8* %changelog +* Mon Jul 30 2007 - werner(a)suse.de +- During time delay calculation cast result not parts to float and + avoid sprint overflows (bug #295501) * Tue Jun 05 2007 - werner(a)suse.de - Correct patch depth * Mon Jun 04 2007 - werner(a)suse.de ++++++ procinfo-float.dif ++++++ --- procinfo.c +++ procinfo.c 2007-07-30 16:53:29.249722825 +0200 @@ -186,7 +186,7 @@ first_page (long sl) the DIFF macro, so that we'll end up with nice multiples of 4 when using the -d option. */ -#define rate (sl>1000000 ? sl/1000000 : 1) +#define rate (sl>1000000 ? (float)(sl/1000000) : (float)1.0) printf ("Mem: %12ld%12ld%12ld%12ld%12ld", DIFF (m_to), DIFF (m_us), DIFF (m_fr), DIFF (m_sh), DIFF (m_bu)); if (have_m_c) @@ -1060,8 +1060,8 @@ main (int ac, char **av) then = now; gettimeofday (&now, 0); if (per_sec) - rate = (float) now.tv_sec + (float) now.tv_usec / 1.0e6 - - (float) then.tv_sec - (float) then.tv_usec / 1.0e6; + rate = (float)((now.tv_sec + (now.tv_usec /1000000)) - + (then.tv_sec + (then.tv_usec/1000000))); } else { putchar ('\n'); --- routines.c +++ routines.c 2007-07-30 16:50:08.564263479 +0200 @@ -388,7 +388,7 @@ hms (unsigned long t) { unsigned int d, h, m, s; - static char buf[22]; + static char buf[256]; t = (t*100ULL) / usr_hz; d = (unsigned int) (t / 8640000); @@ -400,9 +400,11 @@ s = (unsigned int) (t / 100); t = t - (unsigned long) (s * 100); if (d > 0) - sprintf (buf, "%3ud %2u:%02u:%02u.%02u", d, h, m, s, (unsigned int) t); + snprintf (buf, sizeof(buf)-1, + "%3ud %2u:%02u:%02u.%02u", d, h, m, s, (unsigned int) t); else - sprintf (buf, " %2u:%02u:%02u.%02u", h, m, s, (unsigned int) t); + snprintf (buf, sizeof(buf)-1, + " %2u:%02u:%02u.%02u", h, m, s, (unsigned int) t); return buf; } @@ -411,7 +413,7 @@ perc (unsigned long i, unsigned long t, int cpus) { unsigned int v; - static char buf[16]; + static char buf[128]; if ((signed long) i == -1 || t == 0) return "---.-%"; @@ -424,7 +426,7 @@ /* if (v > 1000) return "+++.+%"; else */ - sprintf (buf, "%3u.%u%%", v / 10, v % 10); + snprintf (buf, sizeof(buf)-1, "%3u.%u%%", v / 10, v % 10); return buf; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-lxml
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package python-lxml checked in at Mon Jul 30 20:58:22 CEST 2007. -------- --- python-lxml/python-lxml.changes 2007-01-19 13:03:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-lxml/python-lxml.changes 2007-07-30 15:12:28.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Jul 30 15:10:07 CEST 2007 - toms(a)suse.de + +Updated to 1.3.3 with the following changes: + Features added: + * ElementTree compatible parser ETCompatXMLParser strips + processing instructions and comments while parsing XML + * Parsers now support stripping PIs (keyword argument 'remove_pis') + * etree.fromstring() now supports parsing both HTML and XML, + depending on the parser you pass + * Support base_url keyword argument in HTML() and XML() + + Bugs fixed: + * Parsing from Python Unicode strings failed on some platforms + * Element() did not raise an exception on tag names containing ':' + * Element.getiterator(tag) did not accept Comment and ProcessingInstruction + as tags. It also accepts Element now. + + +------------------------------------------------------------------- @@ -10,0 +30 @@ + Old: ---- lxml-1.1.2.tar.bz2 New: ---- lxml-1.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-lxml.spec ++++++ --- /var/tmp/diff_new_pack.U24871/_old 2007-07-30 20:56:13.000000000 +0200 +++ /var/tmp/diff_new_pack.U24871/_new 2007-07-30 20:56:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-lxml (Version 1.1.2) +# spec file for package python-lxml (Version 1.3.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,9 +13,9 @@ %define modname lxml URL: http://codespeak.net/lxml Summary: A Pythonic binding for the libxml2 and libxslt libraries -Version: 1.1.2 +Version: 1.3.3 Release: 1 -License: BSD License and BSD-like +License: BSD 3-Clause Group: Development/Libraries/Python Source: %{modname}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,7 +57,21 @@ %doc doc CHANGES.txt CREDITS.txt LICENSES.txt README.txt TODO.txt %{py_sitedir}/lxml -%changelog -n python-lxml +%changelog +* Mon Jul 30 2007 - toms(a)suse.de + Updated to 1.3.3 with the following changes: + Features added: + * ElementTree compatible parser ETCompatXMLParser strips + processing instructions and comments while parsing XML + * Parsers now support stripping PIs (keyword argument 'remove_pis') + * etree.fromstring() now supports parsing both HTML and XML, + depending on the parser you pass + * Support base_url keyword argument in HTML() and XML() + Bugs fixed: + * Parsing from Python Unicode strings failed on some platforms + * Element() did not raise an exception on tag names containing ':' + * Element.getiterator(tag) did not accept Comment and ProcessingInstruction + as tags. It also accepts Element now. * Fri Jan 19 2007 - toms(a)suse.de Updated to 1.1.2 with the following changes: Features added: ++++++ lxml-1.1.2.tar.bz2 -> lxml-1.3.3.tar.bz2 ++++++ ++++ 157318 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 cups-backends
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package cups-backends checked in at Mon Jul 30 20:53:30 CEST 2007. -------- --- cups-backends/cups-backends.changes 2006-03-22 19:23:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/cups-backends/cups-backends.changes 2007-07-30 20:33:00.949647000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 30 20:31:55 CEST 2007 - crivera(a)suse.de + +- Silence the hal backend. This will allow current printers + that use the hal backend to work, but it will not report new + printers. This is the first step toward removing the backend + completely. + +------------------------------------------------------------------- New: ---- cups-backends-silenct-hal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-backends.spec ++++++ --- /var/tmp/diff_new_pack.e20349/_old 2007-07-30 20:53:01.000000000 +0200 +++ /var/tmp/diff_new_pack.e20349/_new 2007-07-30 20:53:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cups-backends (Version 1.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,10 +13,10 @@ Name: cups-backends BuildRequires: cups-devel hal-devel Summary: Various Free Backends for the cups Package -License: GPL +License: GPL v2 or later Group: Hardware/Printing Version: 1.0 -Release: 11 +Release: 103 Source0: http://www.srz.de/Members/bla/cups/backend/hpnpf/hpnpf.tgz Source1: http://www.srz.de/Members/bla/cups/backend/hpnpf/hpnpf.txt Source2: cups-pipe.pl @@ -24,6 +24,7 @@ Source5: http://www.linuxprinting.org/download/printing/beh Source6: README-beh.html Patch0: hpnpf.patch +Patch1: cups-backends-silenct-hal.patch Requires: cups-libs, dbus-1, hal BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +47,7 @@ cp -a %{SOURCE4} . cp -a %{SOURCE5} beh cp -a %{SOURCE6} . +%patch1 -p0 %build gcc $RPM_OPT_FLAGS -fPIC -fPIE -pie -DDBUS_API_SUBJECT_TO_CHANGE \ @@ -65,7 +67,12 @@ %{_libdir}/cups/backend/* %doc README-beh.html -%changelog -n cups-backends +%changelog +* Mon Jul 30 2007 - crivera(a)suse.de +- Silence the hal backend. This will allow current printers + that use the hal backend to work, but it will not report new + printers. This is the first step toward removing the backend + completely. * Wed Mar 22 2006 - lmuelle(a)suse.de - Update beh backend to the current version. - Add beh documentation derivated from http://www.linuxprinting.org/beh.html. ++++++ cups-backends-silenct-hal.patch ++++++ diff -ur /usr/src/packages/BUILD/cups-backends-1.0/hal.c ./hal.c --- /usr/src/packages/BUILD/cups-backends-1.0/hal.c 2005-07-26 05:50:29.000000000 -0400 +++ ./hal.c 2007-07-12 15:39:37.000000000 -0400 @@ -75,11 +75,14 @@ static void list_devices (void) { - LibHalContext *hal_ctx; - char **printers; - int i, n; + //LibHalContext *hal_ctx; + //char **printers; + //int i, n; - if (!(hal_ctx = get_hal_ctx ())) + printf("direct hal \"Unknown\" \"Hal printing backend\"\n"); + +#if 0 + if (!(hal_ctx = get_hal_ctx ())) return; printers = libhal_find_device_by_capability (hal_ctx, "printer", &n, NULL); @@ -126,6 +129,7 @@ libhal_ctx_shutdown (hal_ctx, NULL); libhal_ctx_free (hal_ctx); +#endif } /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bluez-hcidump
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package bluez-hcidump checked in at Mon Jul 30 20:52:27 CEST 2007. -------- --- bluez-hcidump/bluez-hcidump.changes 2007-07-03 16:49:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-hcidump/bluez-hcidump.changes 2007-07-30 17:40:16.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jul 30 17:39:41 CEST 2007 - seife(a)suse.de + +- update to v1.39: + * Add support for daemon discover protocol. + * Fix device disconnect handling. +- v1.38: + * Add support for daemon mode. + +------------------------------------------------------------------- Old: ---- bluez-hcidump-1.37.tar.gz New: ---- bluez-hcidump-1.39.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-hcidump.spec ++++++ --- /var/tmp/diff_new_pack.b18555/_old 2007-07-30 20:52:07.000000000 +0200 +++ /var/tmp/diff_new_pack.b18555/_new 2007-07-30 20:52:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bluez-hcidump (Version 1.37) +# spec file for package bluez-hcidump (Version 1.39) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: bluez-hcidump BuildRequires: bluez-libs pkgconfig URL: http://bluez.sourceforge.net -Version: 1.37 +Version: 1.39 Release: 1 Summary: HCI Dumper for Debugging Bluetooth Connections License: GPL v2 or later @@ -66,6 +66,12 @@ %doc AUTHORS COPYING INSTALL ChangeLog NEWS README %changelog +* Mon Jul 30 2007 - seife(a)suse.de +- update to v1.39: + * Add support for daemon discover protocol. + * Fix device disconnect handling. +- v1.38: + * Add support for daemon mode. * Tue Jul 03 2007 - seife(a)suse.de - update to v1.37: * Add decoding for SCO packet flags. ++++++ bluez-hcidump-1.37.tar.gz -> bluez-hcidump-1.39.tar.gz ++++++ ++++ 8404 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/bluez-hcidump-1.37/ChangeLog new/bluez-hcidump-1.39/ChangeLog --- old/bluez-hcidump-1.37/ChangeLog 2007-06-24 23:03:42.000000000 +0200 +++ new/bluez-hcidump-1.39/ChangeLog 2007-07-28 16:41:33.000000000 +0200 @@ -1,3 +1,10 @@ +ver 1.39: + Add support for daemon discover protocol. + Fix device disconnect handling. + +ver 1.38: + Add support for daemon mode. + ver 1.37: Add decoding for SCO packet flags. Add decoding for more extended inquiry features. 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/bluez-hcidump-1.37/configure.in new/bluez-hcidump-1.39/configure.in --- old/bluez-hcidump-1.37/configure.in 2007-06-24 23:03:42.000000000 +0200 +++ new/bluez-hcidump-1.39/configure.in 2007-07-28 16:41:33.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT() -AM_INIT_AUTOMAKE(bluez-hcidump, 1.37) +AM_INIT_AUTOMAKE(bluez-hcidump, 1.39) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE 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/bluez-hcidump-1.37/missing new/bluez-hcidump-1.39/missing --- old/bluez-hcidump-1.37/missing 2007-06-24 23:04:06.000000000 +0200 +++ new/bluez-hcidump-1.39/missing 2007-07-28 16:42:21.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# 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. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # 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). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 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/bluez-hcidump-1.37/src/hcidump.8 new/bluez-hcidump-1.39/src/hcidump.8 --- old/bluez-hcidump-1.37/src/hcidump.8 2007-05-09 08:40:39.000000000 +0200 +++ new/bluez-hcidump-1.39/src/hcidump.8 2007-07-26 09:34:58.000000000 +0200 @@ -64,6 +64,11 @@ Data is not read from a Bluetooth device, but from host .IR host . .TP +.BI -d " <host>" "\fR,\fP \-\^\-wait-dump=" "<host>" +Data is read from a Bluetooth device, but then send to +.IR host +for processing. No data is read if no host is connected. +.TP .BR -t ", " "\-\^\-timestamp" Prepend a time stamp to every packet. .TP 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/bluez-hcidump-1.37/src/hcidump.c new/bluez-hcidump-1.39/src/hcidump.c --- old/bluez-hcidump-1.37/src/hcidump.c 2007-02-18 04:39:03.000000000 +0100 +++ new/bluez-hcidump-1.39/src/hcidump.c 2007-07-28 16:41:34.000000000 +0200 @@ -33,6 +33,7 @@ #include <stdlib.h> #include <string.h> #include <getopt.h> +#include <sys/poll.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/ioctl.h> @@ -75,20 +76,16 @@ WRITE, RECEIVE, SEND, + SERVER, PPPDUMP, AUDIO }; /* Default options */ -static int device; static int snap_len = SNAP_LEN; -static int defpsm = 0; -static int defcompid = DEFAULT_COMPID; static int mode = PARSE; static int permcheck = 1; static int noappend = 0; -static long flags; -static long filter; static char *dump_file = NULL; static char *pppdump_file = NULL; static char *audio_file = NULL; @@ -136,7 +133,7 @@ static inline int read_n(int fd, char *buf, int len) { - register int t = 0, w; + int t = 0, w; while (len > 0) { if ((w = read(fd, buf, len)) < 0) { @@ -153,7 +150,7 @@ static inline int write_n(int fd, char *buf, int len) { - register int t = 0, w; + int t = 0, w; while (len > 0) { if ((w = write(fd, buf, len)) < 0) { @@ -168,7 +165,7 @@ return t; } -static void process_frames(int dev, int sock, int fd, unsigned long flags) +static int process_frames(int dev, int sock, int fd, unsigned long flags) { struct cmsghdr *cmsg; struct msghdr msg; @@ -176,9 +173,17 @@ struct hcidump_hdr *dh; struct btsnoop_pkt *dp; struct frame frm; + struct pollfd fds[2]; + int nfds = 0; char *buf, *ctrl; int len, hdr_size = HCIDUMP_HDR_SIZE; + if (sock < 0) + return -1; + + if (mode == SERVER) + flags |= DUMP_BTSNOOP; + if (snap_len < SNAP_LEN) snap_len = SNAP_LEN; @@ -188,7 +193,7 @@ buf = malloc(snap_len + hdr_size); if (!buf) { perror("Can't allocate data buffer"); - exit(1); + return -1; } dh = (void *) buf; @@ -197,8 +202,9 @@ ctrl = malloc(100); if (!ctrl) { + free(buf); perror("Can't allocate control buffer"); - exit(1); + return -1; } if (dev == HCI_DEV_NONE) @@ -206,11 +212,72 @@ else printf("device: hci%d ", dev); - printf("snap_len: %d filter: 0x%lx\n", snap_len, filter); + printf("snap_len: %d filter: 0x%lx\n", snap_len, parser.filter); memset(&msg, 0, sizeof(msg)); + if (mode == SERVER) { + struct btsnoop_hdr *hdr = (void *) buf; + + btsnoop_version = 1; + btsnoop_type = 1002; + + memcpy(hdr->id, btsnoop_id, sizeof(btsnoop_id)); + hdr->version = htonl(btsnoop_version); + hdr->type = htonl(btsnoop_type); + + printf("btsnoop version: %d datalink type: %d\n", + btsnoop_version, btsnoop_type); + + len = write(fd, buf, BTSNOOP_HDR_SIZE); + if (len < 0) { + perror("Can't create dump header"); + return -1; + } + + if (len != BTSNOOP_HDR_SIZE) { + fprintf(stderr, "Header size mismatch\n"); + return -1; + } + + fds[nfds].fd = fd; + fds[nfds].events = POLLIN; + fds[nfds].revents = 0; + nfds++; + } + + fds[nfds].fd = sock; + fds[nfds].events = POLLIN; + fds[nfds].revents = 0; + nfds++; + while (1) { + int i, n = poll(fds, nfds, -1); + if (n <= 0) + continue; + + for (i = 0; i < nfds; i++) { + if (fds[i].revents & (POLLHUP | POLLERR | POLLNVAL)) { + if (fds[i].fd == sock) + printf("device: disconnected\n"); + else + printf("client: disconnect\n"); + return 0; + } + } + + if (mode == SERVER) { + len = recv(fd, buf, snap_len, MSG_DONTWAIT); + if (len == 0) { + printf("client: disconnect\n"); + return 0; + } + if (len < 0 && errno != EAGAIN && errno != EINTR) { + perror("Connection read failure"); + return -1; + } + } + iv.iov_base = frm.data; iv.iov_len = snap_len; @@ -219,10 +286,12 @@ msg.msg_control = ctrl; msg.msg_controllen = 100; - len = recvmsg(sock, &msg, 0); + len = recvmsg(sock, &msg, MSG_DONTWAIT); if (len < 0) { + if (errno == EAGAIN || errno == EINTR) + continue; perror("Receive failed"); - exit(1); + return -1; } /* Process control message */ @@ -251,6 +320,7 @@ switch (mode) { case WRITE: case SEND: + case SERVER: /* Save or send dump */ if (flags & DUMP_BTSNOOP) { uint64_t ts; @@ -273,7 +343,7 @@ if (write_n(fd, buf, frm.data_len + hdr_size) < 0) { perror("Write error"); - exit(1); + return -1; } break; @@ -283,6 +353,8 @@ break; } } + + return 0; } static void read_dump(int fd) @@ -492,19 +564,19 @@ dd = hci_open_dev(dev); if (dd < 0) { perror("Can't open device"); - exit(1); + return -1; } if (hci_devinfo(dev, &di) < 0) { perror("Can't get device info"); - exit(1); + return -1; } opt = hci_test_bit(HCI_RAW, &di.flags); if (ioctl(dd, HCISETRAW, opt) < 0) { if (errno == EACCES) { perror("Can't access device"); - exit(1); + return -1; } } @@ -515,19 +587,19 @@ sk = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI); if (sk < 0) { perror("Can't create raw socket"); - exit(1); + return -1; } opt = 1; if (setsockopt(sk, SOL_HCI, HCI_DATA_DIR, &opt, sizeof(opt)) < 0) { perror("Can't enable data direction info"); - exit(1); + return -1; } opt = 1; if (setsockopt(sk, SOL_HCI, HCI_TIME_STAMP, &opt, sizeof(opt)) < 0) { perror("Can't enable time stamp"); - exit(1); + return -1; } /* Setup filter */ @@ -536,7 +608,7 @@ hci_filter_all_events(&flt); if (setsockopt(sk, SOL_HCI, HCI_FILTER, &flt, sizeof(flt)) < 0) { perror("Can't set filter"); - exit(1); + return -1; } /* Bind socket to the HCI device */ @@ -545,7 +617,7 @@ if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { printf("Can't attach to device hci%d. %s(%d)\n", dev, strerror(errno), errno); - exit(1); + return -1; } return sk; @@ -556,12 +628,12 @@ struct sockaddr_storage ss; struct addrinfo hints, *res0, *res; int sk = -1, opt = 1; - + memset(&hints, 0, sizeof(hints)); hints.ai_family = af; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP; - + if (getaddrinfo(addr, port, &hints, &res0)) if(getaddrinfo(NULL, port, &hints, &res0)) { perror("getaddrinfo"); @@ -580,7 +652,7 @@ } setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); - + memcpy(&ss, res->ai_addr, res->ai_addrlen); switch(ss.ss_family) { @@ -589,7 +661,8 @@ ((struct sockaddr_in *) &ss)->sin_port = 0; break; case AF_INET6: - memcpy(&((struct sockaddr_in6 *) &ss)->sin6_addr, &in6addr_any, sizeof(in6addr_any)); + memcpy(&((struct sockaddr_in6 *) &ss)->sin6_addr, + &in6addr_any, sizeof(in6addr_any)); ((struct sockaddr_in6 *) &ss)->sin6_port = 0; break; } @@ -614,87 +687,197 @@ return sk; } +static int create_datagram(unsigned short port) +{ + struct sockaddr_in addr; + int sk, opt = 1; + + sk = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (sk < 0) + return -1; + + if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { + close(sk); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = htonl(INADDR_BROADCAST); + + if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + close(sk); + return -1; + } + + return sk; +} + +static unsigned char ping_data[] = { 'p', 'i', 'n', 'g' }; +static unsigned char pong_data[] = { 'p', 'o', 'n', 'g' }; + +static void handle_datagram(int sk) +{ + struct sockaddr_in addr; + socklen_t addr_len = sizeof(addr); + unsigned char buf[64]; + ssize_t len; + + len = recvfrom(sk, buf, sizeof(buf), MSG_DONTWAIT, + (struct sockaddr *) &addr, &addr_len); + + if (len != sizeof(ping_data)) + return; + + if (memcmp(buf, ping_data, sizeof(ping_data)) != 0) + return; + + len = sendto(sk, pong_data, sizeof(pong_data), 0, + (struct sockaddr *) &addr, sizeof(addr)); +} + static int wait_connection(char *addr, char *port) { char hname[100], hport[10]; - struct sockaddr_storage ss; - struct addrinfo hints, *res0, *res; - socklen_t len; - int sk = -1, nsk, opt = 1; + struct addrinfo *ai, *runp; + struct addrinfo hints; + struct pollfd fds[3]; + int err, opt, datagram, nfds = 0; - memset(&hints, 0, sizeof(hints)); - hints.ai_family = af; + memset(&hints, 0, sizeof (hints)); + hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP; - if (getaddrinfo(addr, port, &hints, &res0)) - if (getaddrinfo(NULL, port, &hints, &res0)) { - perror("getaddrinfo"); - exit(1); - } - - for (res = res0; res; res = res->ai_next) { - sk = socket(res->ai_family, res->ai_socktype, res->ai_protocol); - if (sk < 0) { - if (res->ai_next) - continue; + err = getaddrinfo(dump_addr, dump_port, &hints, &ai); + if (err < 0) { + printf("Can't get address info: %s\n", gai_strerror(err)); + return -1; + } + + runp = ai; + + datagram = create_datagram(atoi(dump_port)); + if (datagram < 0) { + printf("server: no discover protocol\n"); + } else { + fds[nfds].fd = datagram; + fds[nfds].events = POLLIN; + nfds++; + } + while (runp != NULL && nfds < sizeof(fds) / sizeof(fds[0])) { + fds[nfds].fd = socket(runp->ai_family, runp->ai_socktype, + runp->ai_protocol); + if (fds[nfds].fd < 0) { perror("Can't create socket"); - freeaddrinfo(res0); - exit(1); + return -1; } - setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); + fds[nfds].events = POLLIN; - if (bind(sk, res->ai_addr, res->ai_addrlen) < 0) { - if(res->ai_next) { - close(sk); - continue; + opt = 1; + setsockopt(fds[nfds].fd, SOL_SOCKET, SO_REUSEADDR, + &opt, sizeof(opt)); + + opt = 0; + setsockopt(fds[nfds].fd, SOL_SOCKET, SO_KEEPALIVE, + &opt, sizeof(opt)); + + if (bind(fds[nfds].fd, runp->ai_addr, runp->ai_addrlen) < 0) { + if (errno != EADDRINUSE) { + perror("Can't bind socket"); + return -1; } - perror("Can't bind socket"); - close(sk); - freeaddrinfo(res0); - exit(1); - } + close(fds[nfds].fd); + } else { + if (listen(fds[nfds].fd, SOMAXCONN) < 0) { + perror("Can't listen on socket"); + return -1; + } + + getnameinfo(runp->ai_addr, runp->ai_addrlen, + hname, sizeof(hname), + hport, sizeof(hport), + NI_NUMERICSERV); + + printf("server: %s:%s snap_len: %d filter: 0x%lx\n", + hname, hport, snap_len, parser.filter); + + nfds++; + } + + runp = runp->ai_next; + } + + freeaddrinfo(ai); - getnameinfo(res->ai_addr, res->ai_addrlen, hname, sizeof(hname), - hport, sizeof(hport), NI_NUMERICSERV); - printf("device: %s:%s snap_len: %d filter: 0x%lx\n", - hname, hport, snap_len, filter); - if (listen(sk, 1) < 0) { - if (res->ai_next) { - close(sk); + while (1) { + int i, n = poll(fds, nfds, -1); + if (n <= 0) + continue; + + for (i = 0; i < nfds; i++) { + struct sockaddr_storage rem; + socklen_t remlen = sizeof(rem); + int sk; + + if (!(fds[i].revents & POLLIN)) + continue; + + if (fds[i].fd == datagram) { + handle_datagram(datagram); continue; } - perror("Can't listen on socket"); - close(sk); - freeaddrinfo(res0); - exit(1); + sk = accept(fds[i].fd, (struct sockaddr *) &rem, &remlen); + if (sk < 0) + continue; + + getnameinfo((struct sockaddr *) &rem, remlen, + hname, sizeof(hname), + hport, sizeof(hport), + NI_NUMERICSERV); + + printf("client: %s:%s snap_len: %d filter: 0x%lx\n", + hname, hport, snap_len, parser.filter); + + for (n = 0; n < nfds; n++) + close(fds[n].fd); + + return sk; } } - freeaddrinfo(res0); + return -1; +} - len = sizeof(ss); - nsk = accept(sk, (struct sockaddr *) &ss, &len); - if (nsk < 0) { - perror("Can't accept new socket"); - close(sk); - freeaddrinfo(res0); - exit(1); - } +static int run_server(int dev, char *addr, char *port, unsigned long flags) +{ + while (1) { + int dd, sk; - getnameinfo((struct sockaddr *) &ss, sizeof(ss), - hname, sizeof(hname), NULL, 0, 0); + sk = wait_connection(addr, port); + if (sk < 0) + continue; - printf("device: %s snap_len: %d filter: 0x%lx\n", - hname, snap_len, filter); + //fcntl(sk, F_SETFL, O_NONBLOCK); - close(sk); + dd = open_socket(dev, flags); + if (dd < 0) { + close(sk); + continue; + } + + process_frames(dev, dd, sk, flags); + + close(dd); + close(sk); + } - return nsk; + return 0; } static struct { @@ -721,8 +904,9 @@ { 0 } }; -static void parse_filter(int argc, char **argv) +static unsigned long parse_filter(int argc, char **argv) { + unsigned long filter = 0; int i,n; for (i = 0; i < argc; i++) { @@ -733,6 +917,8 @@ } } } + + return filter; } static void usage(void) @@ -747,6 +933,7 @@ " -r, --read-dump=file Read dump from a file\n" " -s, --send-dump=host Send dump to a host\n" " -n, --recv-dump=host Receive dump on a host\n" + " -d, --wait-dump=host Wait on a host and send\n" " -t, --ts Display time stamps\n" " -a, --ascii Dump data in ascii\n" " -x, --hex Dump data in hex\n" @@ -778,6 +965,7 @@ { "read-dump", 1, 0, 'r' }, { "send-dump", 1, 0, 's' }, { "recv-dump", 1, 0, 'n' }, + { "wait-dump", 1, 0, 'd' }, { "timestamp", 0, 0, 't' }, { "ascii", 0, 0, 'a' }, { "hex", 0, 0, 'x' }, @@ -802,11 +990,16 @@ int main(int argc, char *argv[]) { + unsigned long flags = 0; + unsigned long filter = 0; + int device = 0; + int defpsm = 0; + int defcompid = DEFAULT_COMPID; int opt, pppdump_fd = -1, audio_fd = -1; printf("HCI sniffer - Bluetooth packet analyzer ver %s\n", VERSION); - while ((opt=getopt_long(argc, argv, "i:l:p:m:w:r:s:n:taxXRC:H:O:P:D:A:BVYZN46h", main_options, NULL)) != -1) { + while ((opt=getopt_long(argc, argv, "i:l:p:m:w:r:s:n:d:taxXRC:H:O:P:D:A:BVYZN46h", main_options, NULL)) != -1) { switch(opt) { case 'i': if (strcasecmp(optarg, "none") && strcasecmp(optarg, "system")) @@ -847,6 +1040,11 @@ dump_addr = optarg; break; + case 'd': + mode = SERVER; + dump_addr = optarg; + break; + case 't': flags |= DUMP_TSTAMP; break; @@ -931,7 +1129,7 @@ optind = 0; if (argc > 0) - parse_filter(argc, argv); + filter = parse_filter(argc, argv); /* Default settings */ if (!filter) @@ -968,6 +1166,11 @@ process_frames(device, open_socket(device, flags), open_connection(dump_addr, dump_port), flags); break; + + case SERVER: + init_parser(flags, filter, defpsm, defcompid, pppdump_fd, audio_fd); + run_server(device, dump_addr, dump_port, flags); + break; } return 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