May 2010 - openSUSE Commits - openSUSE Mailing Lists

commit libimobiledevice for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package libimobiledevice for openSUSE:Factory checked in at Mon May 31 00:49:24 CEST 2010. -------- --- libimobiledevice/libimobiledevice.changes 2010-03-23 19:50:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/libimobiledevice/libimobiledevice.changes 2010-05-12 15:15:08.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 12 15:03:44 CEST 2010 - opensuse(a)sukimashita.com + +- Update to 1.0.1: + * Cleanup includes of files + * Use glib instead of netinet for endianess + * Fix installation_proxy not adding client options correctly + * idevicebackup: better handle broken or missing plist files + * Fix some memory leaks in pairing/handshake process + * Fix label not being used in lockdownd_client_new() + * Update AUTHORS, README and installation instructions + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libimobiledevice-1.0.0.tar.bz2 New: ---- libimobiledevice-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libimobiledevice.spec ++++++ --- /var/tmp/diff_new_pack.BrKQRr/_old 2010-05-31 00:49:11.000000000 +0200 +++ /var/tmp/diff_new_pack.BrKQRr/_new 2010-05-31 00:49:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libimobiledevice (Version 1.0.0) +# spec file for package libimobiledevice (Version 1.0.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: libimobiledevice %define _name libimobiledevice1 -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: LGPL v2 or later BuildRequires: gcc-c++ glib2-devel hal libtasn1-devel libxml2-devel sed ++++++ libimobiledevice-1.0.0.tar.bz2 -> libimobiledevice-1.0.1.tar.bz2 ++++++ ++++ 25025 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 thunar for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package thunar for openSUSE:Factory checked in at Mon May 31 00:49:18 CEST 2010. -------- --- thunar/thunar.changes 2010-04-08 14:50:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/thunar/thunar.changes 2010-05-28 23:09:52.000000000 +0200 @@ -1,0 +2,18 @@ +Fri May 28 21:11:16 UTC 2010 - andrea(a)opensuse.org + +- removed info pages prerequires (no info pages to install) +- fixed -doc subpackage RPM group + +------------------------------------------------------------------- +Mon May 24 19:21:54 UTC 2010 - andrea(a)opensuse.org + +- split libthunarx-1-2 and libthunar-vfs-1-2 to reduce packages + dependencies +- added fdupes to make rpmlint happy +- move %%_datadir/doc/Thunar to -doc subpackage to make + rpmlint happy +- fixed -devel subpackage RPM Group +- split -lang subpackage to reduce main package size and make + rpmlint happy + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunar.spec ++++++ --- /var/tmp/diff_new_pack.WtOkWB/_old 2010-05-31 00:49:03.000000000 +0200 +++ /var/tmp/diff_new_pack.WtOkWB/_new 2010-05-31 00:49:03.000000000 +0200 @@ -21,7 +21,7 @@ Name: thunar Summary: New modern file manager for the Xfce Desktop Environment Version: 1.0.1 -Release: 4 +Release: 5 License: GPLv2+ Url: http://www.xfce.org/ Source: Thunar-%{version}.tar.bz2 @@ -30,10 +30,13 @@ Patch1: %{name}-libpng14.patch Group: System/GUI/XFCE BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-glib-devel exo-devel fam-devel gconf2-devel glib2-devel gtk2-devel hal-devel libexif-devel libpng-devel libxfcegui4-devel startup-notification-devel xfce4-panel-devel xfconf -BuildRequires: gtk-doc intltool perl-XML-Parser update-desktop-files +BuildRequires: dbus-1-glib-devel exo-devel fam-devel gconf2-devel +BuildRequires: glib2-devel gtk2-devel hal-devel libexif-devel libpng-devel +BuildRequires: libxfcegui4-devel startup-notification-devel xfce4-panel-devel xfconf +BuildRequires: fdupes gtk-doc intltool perl-XML-Parser update-desktop-files Requires: xfconf Recommends: ivman +Recommends: %{name}-lang %description Thunar is a new modern file manager for the Xfce Desktop Environment. @@ -43,21 +46,42 @@ with a good start up time and directory load time. Thunar is accessible using Assistive Technologie s and is fully standards compliant. +%package -n libthunar-vfs-1-2 +License: GPLv2+ +Group: Development/Libraries/C and C++ +Summary: Vfs thunar libraries +%description -n libthunar-vfs-1-2 +Thunar is a new modern file manager for the Xfce Desktop Environment. +Thunar has been designed from the ground up to be fas t and +easy-to-use. Its user interface is clean and intuitive, and does not +include any confusing or useless options. Thunar is fast and responsive +with a good start up time and directory load time. Thunar is accessible +using Assistive Technologie s and is fully standards compliant. -Authors: --------- - Benedikt Meurer <benny(a)xfce.org> - Jeffs Franks <jcfranks(a)xfce.org> - see AUTHORS for full list of contributors +%package -n libthunarx-1-2 +License: GPLv2+ +Group: Development/Libraries/C and C++ +Summary: X11 thunar library + +%description -n libthunarx-1-2 +Thunar is a new modern file manager for the Xfce Desktop Environment. +Thunar has been designed from the ground up to be fas t and +easy-to-use. Its user interface is clean and intuitive, and does not +include any confusing or useless options. Thunar is fast and responsive +with a good start up time and directory load time. Thunar is accessible +using Assistive Technologie s and is fully standards compliant. %package devel License: GPLv2+ Requires: thunar = %{version} -Requires: exo-devel glib2-devel gtk2-devel libxfcegui4-devel startup-notification-devel dbus-1-glib-devel gconf2-devel libpng-devel fam-devel hal-devel xfce4-panel-devel libexif-devel +Requires: libthunar-vfs-1-2 = %{version} +Requires: libthunarx-1-2 = %{version} +Requires: exo-devel glib2-devel gtk2-devel libxfcegui4-devel +Requires: startup-notification-devel dbus-1-glib-devel gconf2-devel +Requires: libpng-devel fam-devel hal-devel xfce4-panel-devel libexif-devel Summary: New modern file manager for the Xfce Desktop Environment -Group: System/GUI/XFCE -PreReq: %install_info_prereq +Group: Development/Libraries/C and C++ %description devel Thunar is a new modern file manager for the Xfce Desktop Environment. @@ -67,33 +91,17 @@ with a good start up time and directory load time. Thunar is accessible using Assistive Technologie s and is fully standards compliant. - - -Authors: --------- - Benedikt Meurer <benny(a)xfce.org> - Jeffs Franks <jcfranks(a)xfce.org> - see AUTHORS for full list of contributors - %package doc License: GPLv2+ Requires: thunar = %{version} Summary: Documentation for Thunar -Group: System/GUI/XFCE -AutoReqProv: on -PreReq: %install_info_prereq +Group: Documentation/HTML %description doc HTML development documentation for Thunar. - -Authors: --------- - Benedikt Meurer <benny(a)xfce.org> - Jeffs Franks <jcfranks(a)xfce.org> - see AUTHORS for full list of contributors - +%lang_package %prep %setup -q -n Thunar-%{version} %patch0 @@ -121,19 +129,23 @@ %find_lang Thunar rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{_libdir}/thunarx-1/*.la +%fdupes -s %buildroot/%_datadir -%post -p /sbin/ldconfig +%post -n libthunar-vfs-1-2 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libthunar-vfs-1-2 -p /sbin/ldconfig + +%post -n libthunarx-1-2 -p /sbin/ldconfig + +%postun -n libthunarx-1-2 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files -f Thunar.lang +%files %defattr(-,root,root) %doc README ChangeLog AUTHORS FAQ HACKING THANKS TODO %{_bindir}/* -%{_libdir}/*.so.* %{_libexecdir}/ThunarBulkRename %{_libexecdir}/ThunarHelp %{_libexecdir}/thunar-sendto-email @@ -144,12 +156,10 @@ %{_libexecdir}/xfce4/panel-plugins/thunar-tpa %{_datadir}/xfce4/panel-plugins/thunar-tpa.desktop %{_datadir}/applications/*desktop -%{_datadir}/doc/Thunar/* %{_mandir}/*/Thunar* %{_datadir}/dbus-1/services/org.xfce.* %dir %{_datadir}/Thunar %{_datadir}/Thunar/sendto/*desktop -%dir %{_datadir}/doc/Thunar %dir %{_datadir}/Thunar/sendto %dir %{_datadir}/icons/hicolor/16x16/apps %dir %{_datadir}/icons/hicolor/16x16/stock @@ -166,6 +176,16 @@ %dir %{_sysconfdir}/xdg/Thunar %{_sysconfdir}/xdg/Thunar/uca.xml +%files -n libthunar-vfs-1-2 +%defattr(-,root,root) +%{_libdir}/libthunar-vfs-1.so.2 +%{_libdir}/libthunar-vfs-1.so.2.3.1 + +%files -n libthunarx-1-2 +%defattr(-,root,root) +%{_libdir}/libthunarx-1.so.2 +%{_libdir}/libthunarx-1.so.2.3.1 + %files devel %defattr(-,root,root) %{_libdir}/*.so @@ -184,5 +204,10 @@ %{_datadir}/gtk-doc/html/thunarx/* %dir %{_datadir}/gtk-doc/html/thunar-vfs %{_datadir}/gtk-doc/html/thunar-vfs/* +%dir %{_datadir}/doc/Thunar +%{_datadir}/doc/Thunar/* + +%files lang -f Thunar.lang +%defattr(-,root,root) %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-filters for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package OpenOffice_org-filters for openSUSE:Factory checked in at Mon May 31 00:48:48 CEST 2010. -------- --- OpenOffice_org-filters/OpenOffice_org-filters.changes 2010-05-13 21:44:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-filters/OpenOffice_org-filters.changes 2010-05-28 17:58:32.000000000 +0200 @@ -1,0 +2,18 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m19 +- updated ooo-build to version 3.2.1.3 (3.2.1-rc3) + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m18 (3.2.1-rc2) +- updated ooo-build to version 3.2.1.2 (3.2.1-rc2) + +------------------------------------------------------------------- +Wed May 19 13:10:14 CEST 2010 - pmladek(a)suse.cz + +- disabled jar files repacking on MeeGo; the manifest files had to be in the + right place; it broke component registration + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m17-filters.tar.bz2 New: ---- ooo320-m19-filters.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-filters.spec ++++++ --- /var/tmp/diff_new_pack.XJk2ve/_old 2010-05-31 00:48:33.000000000 +0200 +++ /var/tmp/diff_new_pack.XJk2ve/_new 2010-05-31 00:48:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-filters (Version 3.2.1.1) +# spec file for package OpenOffice_org-filters (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,14 @@ Name: OpenOffice_org-filters -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 %define piece filters +%if 0%{?meego_version} +# the manifest file must be in the right place; registration does not work with some repacked jars +%define __jar_repack %{nil} +%endif #!BuildIgnore: OpenOffice_org BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip ############################ @@ -63,7 +67,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m17 +%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m17-filters.tar.bz2 -> ooo320-m19-filters.tar.bz2 ++++++ OpenOffice_org-filters/ooo320-m17-filters.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-filters/ooo320-m19-filters.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libplist for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package libplist for openSUSE:Factory checked in at Mon May 31 00:48:43 CEST 2010. -------- --- libplist/libplist.changes 2010-04-01 00:18:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/libplist/libplist.changes 2010-04-27 12:47:15.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 27 11:20:20 CEST 2010 - opensuse(a)sukimashita.com + +- Update to version 1.3 + * Endianness, alignment and type-punning fixes + * Fix armel floating point endianess + * Allow compiling with mingw on Windows + * Minor bugfixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libplist-1.2.tar.bz2 New: ---- libplist-1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libplist.spec ++++++ --- /var/tmp/diff_new_pack.KRUmz0/_old 2010-05-31 00:48:30.000000000 +0200 +++ /var/tmp/diff_new_pack.KRUmz0/_new 2010-05-31 00:48:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libplist (Version 1.2) +# spec file for package libplist (Version 1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: libplist -Version: 1.2 -Release: 2 +Version: 1.3 +Release: 1 License: LGPL v2.1 or GPL v2 Summary: Library for handling Apple Binary and XML Property Lists Url: http://github.com/JonathanBeck/libplist ++++++ libplist-1.2.tar.bz2 -> libplist-1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libplist-1.2/CMakeLists.txt new/libplist-1.3/CMakeLists.txt --- old/libplist-1.2/CMakeLists.txt 2010-01-21 21:45:01.000000000 +0100 +++ new/libplist-1.3/CMakeLists.txt 2010-04-18 15:30:19.000000000 +0200 @@ -1,7 +1,7 @@ PROJECT( libplist ) SET( LIBPLIST_VERSION_MAJOR "1" ) -SET( LIBPLIST_VERSION_MINOR "2" ) +SET( LIBPLIST_VERSION_MINOR "3" ) SET( LIBPLIST_SOVERSION "1" ) SET( LIBPLIST_VERSION "${LIBPLIST_VERSION_MAJOR}.${LIBPLIST_VERSION_MINOR}" ) SET( LIBPLIST_LIBVERSION "${LIBPLIST_SOVERSION}.${LIBPLIST_VERSION}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libplist-1.2/README new/libplist-1.3/README --- old/libplist-1.2/README 2010-01-21 21:45:01.000000000 +0100 +++ new/libplist-1.3/README 2010-04-18 15:30:19.000000000 +0200 @@ -29,18 +29,18 @@ == Who/what/where? == -wiki: - http://matt.colyer.name/projects/iphone-linux/index.php?title=Main_Page +Home: + http://www.libimobiledevice.org/ -code: +Code: git clone git://github.com/JonathanBeck/libplist.git -tickets: - http://libiphone.lighthouseapp.com/projects/27916-libiphone/tickets?q=all +Tickets: + http://libiphone.lighthouseapp.com/ Please tag libplist related bugs with 'libplist' -mailing list: - http://lists.mattcolyer.com/listinfo.cgi/iphone-linux-dev-mattcolyer.com +Mailing List: + http://lists.libimobiledevice.org/mailman/listinfo/libimobiledevice-devel updated: - 2009-03-27 + 2010-04-18 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libplist-1.2/doxygen.cfg new/libplist-1.3/doxygen.cfg --- old/libplist-1.2/doxygen.cfg 2010-01-21 21:45:01.000000000 +0100 +++ new/libplist-1.3/doxygen.cfg 2010-04-18 15:30:19.000000000 +0200 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.2 +PROJECT_NUMBER = 1.3 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libplist-1.2/include/plist/Date.h new/libplist-1.3/include/plist/Date.h --- old/libplist-1.2/include/plist/Date.h 2010-01-21 21:45:01.000000000 +0100 +++ new/libplist-1.3/include/plist/Date.h 2010-04-18 15:30:19.000000000 +0200 @@ -25,7 +25,7 @@ #include <plist/Node.h> #include <ctime> -#ifdef _MSC_VER +#ifdef _WIN32 #include <Winsock2.h> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libplist-1.2/src/bplist.c new/libplist-1.3/src/bplist.c --- old/libplist-1.2/src/bplist.c 2010-01-21 21:45:01.000000000 +0100 +++ new/libplist-1.3/src/bplist.c 2010-04-18 15:30:19.000000000 +0200 @@ -63,6 +63,40 @@ BPLIST_MASK = 0xF0 }; +static void float_byte_convert(uint8_t * address, size_t size) +{ +#if G_BYTE_ORDER == G_LITTLE_ENDIAN && !defined (__VFP_FP__) + uint8_t i = 0, j = 0; + uint8_t tmp = 0; + + for (i = 0; i < (size / 2); i++) + { + tmp = address[i]; + j = ((size - 1) + 0) - i; + address[i] = address[j]; + address[j] = tmp; + } +#endif +} + +union plist_uint_ptr +{ + void *src; + uint8_t *u8ptr; + uint16_t *u16ptr; + uint32_t *u32ptr; + uint64_t *u64ptr; +}; + +#define get_unaligned(ptr) \ + ({ \ + struct __attribute__((packed)) { \ + typeof(*(ptr)) __v; \ + } *__p = (void *) (ptr); \ + __p->__v; \ + }) + + static void byte_convert(uint8_t * address, size_t size) { #if G_BYTE_ORDER == G_LITTLE_ENDIAN @@ -79,23 +113,36 @@ #endif } -static uint32_t uint24_from_be(char *buff) +static uint32_t uint24_from_be(union plist_uint_ptr buf) { + union plist_uint_ptr tmp; uint32_t ret = 0; - uint8_t *tmp = (uint8_t *) &ret; - memcpy(tmp + 1, buff, 3 * sizeof(char)); - byte_convert(tmp, sizeof(uint32_t)); + + tmp.src = &ret; + + memcpy(tmp.u8ptr + 1, buf.u8ptr, 3 * sizeof(char)); + + byte_convert(tmp.u8ptr, sizeof(uint32_t)); return ret; } #define UINT_TO_HOST(x, n) \ - (n == 8 ? GUINT64_FROM_BE( *(uint64_t *)(x) ) : \ - (n == 4 ? GUINT32_FROM_BE( *(uint32_t *)(x) ) : \ - (n == 3 ? uint24_from_be( (char*)x ) : \ - (n == 2 ? GUINT16_FROM_BE( *(uint16_t *)(x) ) : \ - *(uint8_t *)(x) )))) - -#define be64dec(x) GUINT64_FROM_BE( *(uint64_t*)(x) ) + ({ \ + union plist_uint_ptr __up; \ + __up.src = x; \ + (n == 8 ? GUINT64_FROM_BE( get_unaligned(__up.u64ptr) ) : \ + (n == 4 ? GUINT32_FROM_BE( get_unaligned(__up.u32ptr) ) : \ + (n == 3 ? uint24_from_be( __up ) : \ + (n == 2 ? GUINT16_FROM_BE( get_unaligned(__up.u16ptr) ) : \ + *__up.u8ptr )))); \ + }) + +#define be64dec(x) \ + ({ \ + union plist_uint_ptr __up; \ + __up.src = x; \ + GUINT64_FROM_BE( get_unaligned(__up.u64ptr) ); \ + }) #define get_needed_bytes(x) \ ( ((uint64_t)x) < (1ULL << 8) ? 1 : \ @@ -136,23 +183,27 @@ { plist_data_t data = plist_new_plist_data(); float floatval = 0.0; + uint8_t* buf; size = 1 << size; // make length less misleading + buf = malloc (size); + memcpy (buf, bnode, size); switch (size) { case sizeof(float): - floatval = *(float *) bnode; - byte_convert((uint8_t *) & floatval, sizeof(float)); + float_byte_convert(buf, size); + floatval = *(float *) buf; data->realval = floatval; break; case sizeof(double): - data->realval = *(double *) bnode; - byte_convert((uint8_t *) & (data->realval), sizeof(double)); + float_byte_convert(buf, size); + data->realval = *(double *) buf; break; default: free(data); return NULL; } + free (buf); data->type = PLIST_REAL; data->length = sizeof(double); @@ -626,6 +677,11 @@ //do not write 3bytes int node if (size == 3) size++; + +#if G_BYTE_ORDER == G_BIG_ENDIAN + val = val << ((sizeof(uint64_t) - size) * 8); +#endif + buff = (uint8_t *) malloc(sizeof(uint8_t) + size); buff[0] = BPLIST_UINT | Log2(size); memcpy(buff + 1, &val, size); @@ -636,7 +692,7 @@ static void write_real(GByteArray * bplist, double val) { - uint64_t size = get_real_bytes(*((uint64_t *) & val)); //cheat to know used space + uint64_t size = get_real_bytes(val); //cheat to know used space uint8_t *buff = (uint8_t *) malloc(sizeof(uint8_t) + size); buff[0] = BPLIST_REAL | Log2(size); if (size == sizeof(double)) @@ -648,7 +704,7 @@ float tmpval = (float) val; memcpy(buff + 1, &tmpval, size); } - byte_convert(buff + 1, size); + float_byte_convert(buff + 1, size); g_byte_array_append(bplist, buff, sizeof(uint8_t) + size); free(buff); } @@ -659,7 +715,7 @@ uint8_t *buff = (uint8_t *) malloc(sizeof(uint8_t) + size); buff[0] = BPLIST_DATE | Log2(size); memcpy(buff + 1, &val, size); - byte_convert(buff + 1, size); + float_byte_convert(buff + 1, size); g_byte_array_append(bplist, buff, sizeof(uint8_t) + size); free(buff); } @@ -728,6 +784,9 @@ for (i = 0, cur = node->children; cur && i < size; cur = cur->next, i++) { idx = *(uint64_t *) (g_hash_table_lookup(ref_table, cur)); +#if G_BYTE_ORDER == G_BIG_ENDIAN + idx = idx << ((sizeof(uint64_t) - dict_param_size) * 8); +#endif memcpy(buff + i * dict_param_size, &idx, dict_param_size); byte_convert(buff + i * dict_param_size, dict_param_size); } @@ -763,10 +822,16 @@ for (i = 0, cur = node->children; cur && i < size; cur = cur->next->next, i++) { idx1 = *(uint64_t *) (g_hash_table_lookup(ref_table, cur)); +#if G_BYTE_ORDER == G_BIG_ENDIAN + idx1 = idx1 << ((sizeof(uint64_t) - dict_param_size) * 8); +#endif memcpy(buff + i * dict_param_size, &idx1, dict_param_size); byte_convert(buff + i * dict_param_size, dict_param_size); idx2 = *(uint64_t *) (g_hash_table_lookup(ref_table, cur->next)); +#if G_BYTE_ORDER == G_BIG_ENDIAN + idx2 = idx2 << ((sizeof(uint64_t) - dict_param_size) * 8); +#endif memcpy(buff + (i + size) * dict_param_size, &idx2, dict_param_size); byte_convert(buff + (i + size) * dict_param_size, dict_param_size); } @@ -896,7 +961,12 @@ for (i = 0; i < num_objects; i++) { uint8_t *offsetbuff = (uint8_t *) malloc(offset_size); - memcpy(offsetbuff, offsets + i, offset_size); + +#if G_BYTE_ORDER == G_BIG_ENDIAN + offsets[i] = offsets[i] << ((sizeof(uint64_t) - offset_size) * 8); +#endif + + memcpy(offsetbuff, &offsets[i], offset_size); byte_convert(offsetbuff, offset_size); g_byte_array_append(bplist_buff, offsetbuff, offset_size); free(offsetbuff); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libplist-1.2/src/xplist.c new/libplist-1.3/src/xplist.c --- old/libplist-1.2/src/xplist.c 2010-01-21 21:45:01.000000000 +0100 +++ new/libplist-1.3/src/xplist.c 2010-04-18 15:30:19.000000000 +0200 @@ -26,6 +26,7 @@ #include <stdio.h> #include <inttypes.h> +#include <locale.h> #include <libxml/parser.h> #include <libxml/tree.h> @@ -371,12 +372,33 @@ root_node = xmlDocGetRootElement(plist_doc); root.xml = root_node; + char *current_locale = setlocale(LC_NUMERIC, NULL); + char *saved_locale = NULL; + if (current_locale) { + saved_locale = strdup(current_locale); + } + if (saved_locale) { + setlocale(LC_NUMERIC, "POSIX"); + } node_to_xml(plist, &root); - xmlDocDumpMemory(plist_doc, (xmlChar **) plist_xml, &size); - if (size >= 0) + xmlChar* tmp = NULL; + xmlDocDumpMemory(plist_doc, &tmp, &size); + if (size >= 0 && tmp) + { + /* make sure to copy the terminating 0-byte */ + *plist_xml = (char*)malloc((size+1) * sizeof(char)); + memcpy(*plist_xml, tmp, size+1); *length = size; + xmlFree(tmp); + tmp = NULL; + } xmlFreeDoc(plist_doc); + + if (saved_locale) { + setlocale(LC_NUMERIC, saved_locale); + free(saved_locale); + } } void plist_from_xml(const char *plist_xml, uint32_t length, plist_t * plist) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 usbmuxd for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package usbmuxd for openSUSE:Factory checked in at Mon May 31 00:48:21 CEST 2010. -------- --- usbmuxd/usbmuxd.changes 2010-03-23 19:38:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/usbmuxd/usbmuxd.changes 2010-05-11 22:07:23.000000000 +0200 @@ -1,0 +2,11 @@ +Tue May 11 22:07:50 CEST 2010 - opensuse(a)sukimashita.com + +- Update to version 1.0.4 + * Fix aborts due to transmit window overflow + * libusbmuxd: close connection after enumerating devices + * Ignore SIGPIPE, otherwise usbmuxd might shut down + * OSX: add workaround for missing ppoll system call + * Detect the iPad and let usbmuxd talk to it + * libusbmuxd: support shorter device info record messages + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- usbmuxd-1.0.3.tar.bz2 New: ---- usbmuxd-1.0.4.tar.bz2 usbmuxd-fix-old-cmake-syntax.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbmuxd.spec ++++++ --- /var/tmp/diff_new_pack.18sIgq/_old 2010-05-31 00:47:56.000000000 +0200 +++ /var/tmp/diff_new_pack.18sIgq/_new 2010-05-31 00:47:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package usbmuxd (Version 1.0.3) +# spec file for package usbmuxd (Version 1.0.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: usbmuxd %define _libname libusbmuxd -Version: 1.0.3 +Version: 1.0.4 Release: 1 License: LGPL v2.1 or GPL v2 BuildRequires: libusb-1_0-devel >= 1.0.3 @@ -30,6 +30,7 @@ %endif Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-disable-priv-drop.patch +Patch1: %{name}-fix-old-cmake-syntax.patch Group: System/Libraries Summary: Socket daemon for the usbmux protocol of iPhone/iPod Touch devices Url: http://git.marcansoft.com/?p=usbmuxd.git @@ -114,6 +115,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build mkdir build ++++++ usbmuxd-1.0.3.tar.bz2 -> usbmuxd-1.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/CMakeLists.txt new/usbmuxd-1.0.4/CMakeLists.txt --- old/usbmuxd-1.0.3/CMakeLists.txt 2010-03-22 16:31:41.000000000 +0100 +++ new/usbmuxd-1.0.4/CMakeLists.txt 2010-05-11 16:36:08.000000000 +0200 @@ -1,32 +1,53 @@ PROJECT(usbmuxd) -set(USBMUXD_VERSION "1.0.0") -set(LIBUSBMUXD_VERSION "${USBMUXD_VERSION}") +cmake_minimum_required(VERSION 2.6) + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Modules/") + +include(VersionTag) + +set(USBMUXD_VERSION "${VERSION_TAG}") +set(LIBUSBMUXD_VERSION "${VERSION_TAG}") set(LIBUSBMUXD_SOVERSION "1") -cmake_minimum_required(VERSION 2.6) +message("-- Configuring usbmuxd v${VERSION_TAG}") if(NOT DEFINED LIB_SUFFIX) - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(LIB_SUFFIX "64" CACHE STRING "Define suffix of library directory name (32/64)" ) - else(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - endif(CMAKE_SIZEOF_VOID_P EQUAL 8) -endif(NOT DEFINED LIB_SUFFIX) - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Modules/") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(LIB_SUFFIX "64" CACHE STRING "Define suffix of library directory name (32/64)" ) + else() + set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + endif() +endif() # let CFLAGS env override this if(CMAKE_C_FLAGS STREQUAL "") - set(CMAKE_C_FLAGS "-O2") -endif(CMAKE_C_FLAGS STREQUAL "") + set(CMAKE_C_FLAGS "-O2") +endif() + +option(WITH_USBMUXD "Build usbmux daemon (usbmuxd)" ON) +if(WITH_USBMUXD) + message("-- Will build usbmuxd: YES") +else() + message("-- Will build usbmuxd: NO") + message("** NOTE: will NOT build usbmuxd **") + if(WIN32 OR APPLE) + message("** Make sure iTunes is installed, otherwise this software will not work! **") + else() + message("** You'll need a working usbmuxd implementation for this software to work! **") + endif() +endif() add_definitions(-Wall) add_subdirectory (libusbmuxd) -add_subdirectory (daemon) +if (WITH_USBMUXD) + add_subdirectory (daemon) + if (NOT(WIN32 OR APPLE)) + add_subdirectory (udev) + endif() +endif() add_subdirectory (tools) -add_subdirectory (udev) # pkg-config configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libusbmuxd.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd.pc") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/Modules/VersionTag.cmake new/usbmuxd-1.0.4/Modules/VersionTag.cmake --- old/usbmuxd-1.0.3/Modules/VersionTag.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/usbmuxd-1.0.4/Modules/VersionTag.cmake 2010-05-11 16:36:08.000000000 +0200 @@ -0,0 +1,13 @@ +execute_process( + COMMAND "sh" "${CMAKE_SOURCE_DIR}/Modules/describe.sh" + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + OUTPUT_VARIABLE DESCRIBE + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +if(DESCRIBE STREQUAL "") + set (VERSION_TAG "UNKNOWN") +else() + string(REGEX REPLACE "^v" "" VERSION_TAG "${DESCRIBE}") +endif() + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/Modules/describe.sh new/usbmuxd-1.0.4/Modules/describe.sh --- old/usbmuxd-1.0.3/Modules/describe.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/usbmuxd-1.0.4/Modules/describe.sh 2010-05-11 16:36:08.000000000 +0200 @@ -0,0 +1,17 @@ +#!/bin/bash + +# Check for git and a git repo. +if head=`git rev-parse --verify HEAD 2>/dev/null`; then + echo -n `git describe` + + # Are there uncommitted changes? + git update-index --refresh --unmerged > /dev/null + git diff-index --quiet HEAD || echo -n -dirty +else +# Check for version tag + if [ -e version.tag ]; then + echo -n `cat version.tag` + fi +fi + +echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/daemon/device.c new/usbmuxd-1.0.4/daemon/device.c --- old/usbmuxd-1.0.3/daemon/device.c 2010-03-22 16:31:41.000000000 +0100 +++ new/usbmuxd-1.0.4/daemon/device.c 2010-05-11 16:36:08.000000000 +0200 @@ -89,7 +89,7 @@ uint16_t sport, dport; uint32_t tx_seq, tx_ack, tx_acked, tx_win; uint32_t rx_seq, rx_recvd, rx_ack, rx_win; - int max_payload; + uint32_t max_payload; uint32_t sendable; int flags; unsigned char *ib_buf; @@ -322,7 +322,12 @@ static void update_connection(struct mux_connection *conn) { - conn->sendable = conn->rx_win - (conn->tx_seq - conn->rx_ack); + uint32_t sent = conn->tx_seq - conn->rx_ack; + + if(conn->rx_win > sent) + conn->sendable = conn->rx_win - sent; + else + conn->sendable = 0; if(conn->sendable > conn->ob_capacity) conn->sendable = conn->ob_capacity; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/daemon/main.c new/usbmuxd-1.0.4/daemon/main.c --- old/usbmuxd-1.0.3/daemon/main.c 2010-03-22 16:31:41.000000000 +0100 +++ new/usbmuxd-1.0.4/daemon/main.c 2010-05-11 16:36:08.000000000 +0200 @@ -147,6 +147,21 @@ sigaction(SIGUSR2, &sa, NULL); } +#ifdef __APPLE__ +static int ppoll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout, const sigset_t *sigmask) +{ + int ready; + sigset_t origmask; + int to = timeout->tv_sec*1000 + timeout->tv_nsec/1000000; + + sigprocmask(SIG_SETMASK, sigmask, &origmask); + ready = poll(fds, nfds, to); + sigprocmask(SIG_SETMASK, &origmask, NULL); + + return ready; +} +#endif + int main_loop(int listenfd) { int to, cnt, i, dto; @@ -425,6 +440,7 @@ should_discover = 0; set_signal_handlers(); + signal(SIGPIPE, SIG_IGN); res = lfd = open(lockfile, O_WRONLY|O_CREAT, 0644); if(res == -1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/daemon/usb.h new/usbmuxd-1.0.4/daemon/usb.h --- old/usbmuxd-1.0.3/daemon/usb.h 2010-03-22 16:31:41.000000000 +0100 +++ new/usbmuxd-1.0.4/daemon/usb.h 2010-05-11 16:36:08.000000000 +0200 @@ -45,7 +45,7 @@ #define VID_APPLE 0x5ac #define PID_RANGE_LOW 0x1290 -#define PID_RANGE_MAX 0x1299 +#define PID_RANGE_MAX 0x129a #define USB_INTERFACE 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/libusbmuxd/libusbmuxd.c new/usbmuxd-1.0.4/libusbmuxd/libusbmuxd.c --- old/usbmuxd-1.0.3/libusbmuxd/libusbmuxd.c 2010-03-22 16:31:41.000000000 +0100 +++ new/usbmuxd-1.0.4/libusbmuxd/libusbmuxd.c 2010-05-11 16:36:08.000000000 +0200 @@ -353,7 +353,7 @@ // receive device list while (1) { if (recv_buf_timeout(sfd, &hdr, sizeof(hdr), 0, 1000) == sizeof(hdr)) { - if (hdr.length != sizeof(hdr)+sizeof(dev_info)) { + if ((hdr.length < 48) || (hdr.length > sizeof(hdr)+sizeof(dev_info))) { // invalid packet size received! fprintf(stderr, "%s: Invalid packet size (%d) received when expecting a device info record.\n", @@ -398,6 +398,9 @@ } } + // explicitly close connection + close(sfd); + // terminating zero record newlist = (usbmuxd_device_info_t*) realloc(*device_list, sizeof(usbmuxd_device_info_t) * (dev_cnt + 1)); memset(newlist + dev_cnt, 0, sizeof(usbmuxd_device_info_t)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/libusbmuxd/sock_stuff.c new/usbmuxd-1.0.4/libusbmuxd/sock_stuff.c --- old/usbmuxd-1.0.3/libusbmuxd/sock_stuff.c 2010-03-22 16:31:41.000000000 +0100 +++ new/usbmuxd-1.0.4/libusbmuxd/sock_stuff.c 2010-05-11 16:36:08.000000000 +0200 @@ -148,7 +148,7 @@ return -1; } - if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1) { + if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void*)&yes, sizeof(int)) == -1) { perror("setsockopt()"); close(sfd); return -1; @@ -204,7 +204,7 @@ return -1; } - if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1) { + if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void*)&yes, sizeof(int)) == -1) { perror("setsockopt()"); close(sfd); return -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/libusbmuxd.pc.in new/usbmuxd-1.0.4/libusbmuxd.pc.in --- old/usbmuxd-1.0.3/libusbmuxd.pc.in 2010-03-22 16:31:41.000000000 +0100 +++ new/usbmuxd-1.0.4/libusbmuxd.pc.in 2010-05-11 16:36:08.000000000 +0200 @@ -6,7 +6,6 @@ Name: libusbmuxd Description: A library to communicate with the usbmux daemon Version: ${USBMUXD_VERSION} -Requires: libusb-1.0 >= 1.0.3 Libs: -L${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} -lusbmuxd Cflags: -I${CMAKE_INSTALL_PREFIX}/include diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/tools/iproxy.c new/usbmuxd-1.0.4/tools/iproxy.c --- old/usbmuxd-1.0.3/tools/iproxy.c 2010-03-22 16:31:41.000000000 +0100 +++ new/usbmuxd-1.0.4/tools/iproxy.c 2010-05-11 16:36:08.000000000 +0200 @@ -42,8 +42,6 @@ static uint16_t listen_port = 0; static uint16_t device_port = 0; -pthread_mutex_t smutex = PTHREAD_MUTEX_INITIALIZER; - struct client_data { int fd; int sfd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/udev/85-usbmuxd.rules.in new/usbmuxd-1.0.4/udev/85-usbmuxd.rules.in --- old/usbmuxd-1.0.3/udev/85-usbmuxd.rules.in 2010-03-22 16:31:41.000000000 +0100 +++ new/usbmuxd-1.0.4/udev/85-usbmuxd.rules.in 2010-05-11 16:36:08.000000000 +0200 @@ -1,7 +1,7 @@ # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd) -# Forces iPhone 1.0, 3G, 3GS and iPodTouch 1 and 2 to USB configuration 3 and run usbmuxd -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" +# Forces iPhone 1.0, 3G, 3GS, iPodTouch 1/2 and iPad to USB configuration 3 and run usbmuxd +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" -# Exit usbmuxd when the last phone is removed -ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" +# Exit usbmuxd when the last device is removed +ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9a]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbmuxd-1.0.3/version.tag new/usbmuxd-1.0.4/version.tag --- old/usbmuxd-1.0.3/version.tag 1970-01-01 01:00:00.000000000 +0100 +++ new/usbmuxd-1.0.4/version.tag 2010-05-11 16:40:26.000000000 +0200 @@ -0,0 +1 @@ +1.0.4 ++++++ usbmuxd-disable-priv-drop.patch ++++++ --- /var/tmp/diff_new_pack.18sIgq/_old 2010-05-31 00:47:56.000000000 +0200 +++ /var/tmp/diff_new_pack.18sIgq/_new 2010-05-31 00:47:56.000000000 +0200 @@ -1,13 +1,13 @@ diff --git a/udev/85-usbmuxd.rules.in b/udev/85-usbmuxd.rules.in -index f68a5fa..7fe3df8 100644 +index b24a2b4..c392f43 100644 --- a/udev/85-usbmuxd.rules.in +++ b/udev/85-usbmuxd.rules.in @@ -1,7 +1,7 @@ # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd) - # Forces iPhone 1.0, 3G, 3GS and iPodTouch 1 and 2 to USB configuration 3 and run usbmuxd --ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" -+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u" + # Forces iPhone 1.0, 3G, 3GS, iPodTouch 1/2 and iPad to USB configuration 3 and run usbmuxd +-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" ++ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u" - # Exit usbmuxd when the last phone is removed - ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" + # Exit usbmuxd when the last device is removed + ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9a]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" ++++++ usbmuxd-fix-old-cmake-syntax.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8eccd2d..7dddfd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ add_definitions(-Wall) add_subdirectory (libusbmuxd) if (WITH_USBMUXD) add_subdirectory (daemon) - if (NOT(WIN32 OR APPLE)) + if (NOT WIN32 AND NOT APPLE) add_subdirectory (udev) endif() 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 OpenOffice_org-libs-core for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package OpenOffice_org-libs-core for openSUSE:Factory checked in at Mon May 31 00:47:57 CEST 2010. -------- --- OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2010-05-13 21:45:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2010-05-28 17:59:30.000000000 +0200 @@ -1,0 +2,18 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m19 +- updated ooo-build to version 3.2.1.3 (3.2.1-rc3) + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m18 (3.2.1-rc2) +- updated ooo-build to version 3.2.1.2 (3.2.1-rc2) + +------------------------------------------------------------------- +Wed May 19 13:10:14 CEST 2010 - pmladek(a)suse.cz + +- disabled jar files repacking on MeeGo; the manifest files had to be in the + right place; it broke component registration + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m17-libs-core.tar.bz2 New: ---- ooo320-m19-libs-core.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-core.spec ++++++ --- /var/tmp/diff_new_pack.cnvXrB/_old 2010-05-31 00:45:19.000000000 +0200 +++ /var/tmp/diff_new_pack.cnvXrB/_new 2010-05-31 00:45:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-core (Version 3.2.1.1) +# spec file for package OpenOffice_org-libs-core (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,16 @@ Name: OpenOffice_org-libs-core -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 %define piece libs-core # version of the postgresql driver %define postgresql_version 0.7.6a +%if 0%{?meego_version} +# the manifest file must be in the right place; registration does not work with some repacked jars +%define __jar_repack %{nil} +%endif #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-gui-devel = %version @@ -82,7 +86,7 @@ %define ooo_prefix %_libdir %define ooo_home ooo3 %define ooo_basis_dir basis3.2 -%define ooo_build_tag ooo320-m17 +%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m17-libs-core.tar.bz2 -> ooo320-m19-libs-core.tar.bz2 ++++++ OpenOffice_org-libs-core/ooo320-m17-libs-core.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-core/ooo320-m19-libs-core.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-libs-extern for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package OpenOffice_org-libs-extern for openSUSE:Factory checked in at Mon May 31 00:45:05 CEST 2010. -------- --- OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-05-13 21:45:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-05-28 17:59:42.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m19 +- updated ooo-build to version 3.2.1.3 (3.2.1-rc3) + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m18 (3.2.1-rc2) +- updated ooo-build to version 3.2.1.2 (3.2.1-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m17-libs-extern-sys.tar.bz2 ooo320-m17-libs-extern.tar.bz2 New: ---- ooo320-m19-libs-extern-sys.tar.bz2 ooo320-m19-libs-extern.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.3KX4fm/_old 2010-05-31 00:44:48.000000000 +0200 +++ /var/tmp/diff_new_pack.3KX4fm/_new 2010-05-31 00:44:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-extern (Version 3.2.1.1) +# spec file for package OpenOffice_org-libs-extern (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,9 +21,9 @@ Name: OpenOffice_org-libs-extern # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 %define piece libs-extern #!BuildIgnore: OpenOffice_org # urg, ure dep is now required for cppunit ... @@ -65,7 +65,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m17 +%define ooo_build_tag ooo320-m19 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m17-libs-extern-sys.tar.bz2 -> ooo320-m19-libs-extern-sys.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo320-m17-libs-extern-sys.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-extern/ooo320-m19-libs-extern-sys.tar.bz2 differ: char 11, line 1 ++++++ ooo320-m17-libs-extern.tar.bz2 -> ooo320-m19-libs-extern.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo320-m17-libs-extern.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-extern/ooo320-m19-libs-extern.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-libs-gui for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package OpenOffice_org-libs-gui for openSUSE:Factory checked in at Mon May 31 00:45:03 CEST 2010. -------- --- OpenOffice_org-libs-gui/OpenOffice_org-libs-gui.changes 2010-05-13 21:47:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-libs-gui/OpenOffice_org-libs-gui.changes 2010-05-28 18:01:06.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m19 +- updated ooo-build to version 3.2.1.3 (3.2.1-rc3) + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m18 (3.2.1-rc2) +- updated ooo-build to version 3.2.1.2 (3.2.1-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m17-l10n.tar.bz2 ooo320-m17-libs-gui.tar.bz2 New: ---- ooo320-m19-l10n.tar.bz2 ooo320-m19-libs-gui.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-gui.spec ++++++ --- /var/tmp/diff_new_pack.KMFpFM/_old 2010-05-31 00:44:51.000000000 +0200 +++ /var/tmp/diff_new_pack.KMFpFM/_new 2010-05-31 00:44:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-gui (Version 3.2.1.1) +# spec file for package OpenOffice_org-libs-gui (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,9 +20,9 @@ %define distro SUSE Name: OpenOffice_org-libs-gui -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 %define piece libs-gui #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel = %version @@ -63,7 +63,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m17 +%define ooo_build_tag ooo320-m19 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m17-l10n.tar.bz2 -> ooo320-m19-l10n.tar.bz2 ++++++ OpenOffice_org-libs-gui/ooo320-m17-l10n.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-gui/ooo320-m19-l10n.tar.bz2 differ: char 11, line 1 ++++++ ooo320-m17-libs-gui.tar.bz2 -> ooo320-m19-libs-gui.tar.bz2 ++++++ OpenOffice_org-libs-gui/ooo320-m17-libs-gui.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-gui/ooo320-m19-libs-gui.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-artwork for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package OpenOffice_org-artwork for openSUSE:Factory checked in at Mon May 31 00:44:37 CEST 2010. -------- --- OpenOffice_org-artwork/OpenOffice_org-artwork.changes 2010-05-13 21:43:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-artwork/OpenOffice_org-artwork.changes 2010-05-28 17:57:41.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m19 +- updated ooo-build to version 3.2.1.3 (3.2.1-rc3) + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m18 (3.2.1-rc2) +- updated ooo-build to version 3.2.1.2 (3.2.1-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m17-artwork.tar.bz2 New: ---- ooo320-m19-artwork.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-artwork.spec ++++++ --- /var/tmp/diff_new_pack.S7BO5Q/_old 2010-05-31 00:40:47.000000000 +0200 +++ /var/tmp/diff_new_pack.S7BO5Q/_new 2010-05-31 00:40:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-artwork (Version 3.2.1.1) +# spec file for package OpenOffice_org-artwork (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-artwork -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 %define piece artwork #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-bootstrap = %version @@ -37,7 +37,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m17 +%define ooo_build_tag ooo320-m19 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m17-artwork.tar.bz2 -> ooo320-m19-artwork.tar.bz2 ++++++ OpenOffice_org-artwork/ooo320-m17-artwork.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-artwork/ooo320-m19-artwork.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-ure for openSUSE:Factory
by root＠hilbert.suse.de 30 May '10

30 May '10

Hello community, here is the log from the commit of package OpenOffice_org-ure for openSUSE:Factory checked in at Mon May 31 00:44:33 CEST 2010. -------- --- OpenOffice_org-ure/OpenOffice_org-ure.changes 2010-05-13 21:48:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-ure/OpenOffice_org-ure.changes 2010-05-28 18:01:51.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m19 +- updated ooo-build to version 3.2.1.3 (3.2.1-rc3) + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m18 (3.2.1-rc2) +- updated ooo-build to version 3.2.1.2 (3.2.1-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m17-sdk.tar.bz2 ooo320-m17-ure.tar.bz2 New: ---- ooo320-m19-sdk.tar.bz2 ooo320-m19-ure.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-ure.spec ++++++ --- /var/tmp/diff_new_pack.VqVTOe/_old 2010-05-31 00:40:44.000000000 +0200 +++ /var/tmp/diff_new_pack.VqVTOe/_new 2010-05-31 00:40:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-ure (Version 3.2.1.1) +# spec file for package OpenOffice_org-ure (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-ure -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 %define piece ure #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-bootstrap = %version @@ -38,7 +38,7 @@ %define ooo_prefix %_libdir %define ooo_home ooo3 %define ooo_basis_dir basis3.2 -%define ooo_build_tag ooo320-m17 +%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m17-sdk.tar.bz2 -> ooo320-m19-sdk.tar.bz2 ++++++ ++++ 471300 lines of diff (skipped) ++++++ ooo320-m17-ure.tar.bz2 -> ooo320-m19-ure.tar.bz2 ++++++ ++++ 2299024 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