July 2007 - openSUSE Commits - openSUSE Mailing Lists

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

30 Jul '07

Hello community, here is the log from the commit of package autogen checked in at Mon Jul 30 20:51:29 CEST 2007. -------- --- autogen/autogen.changes 2007-05-07 14:52:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/autogen/autogen.changes 2007-07-30 14:20:30.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Jul 30 14:19:31 CEST 2007 - schwab(a)suse.de + +- Update to autogen 5.9.2. + * GNU GPL v3 is now emitted with the "gpl" and "lgpl" functions. + * usage.tpl template has been added. + * getopt.tpl uses this template for constructing its usage string. + * if "short-usage" or "full-usage" can be used to specify the form + of the usage text: + * not supplied -> compute it at run time + * supplied, but empty -> use "usage.tpl" to compute it + * is a variable name -> insert into option structure + * is text -> emit the text and point to it from option structure + +------------------------------------------------------------------- Old: ---- autogen-5.9.1.tar.bz2 New: ---- autogen-5.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autogen.spec ++++++ --- /var/tmp/diff_new_pack.F15808/_old 2007-07-30 20:50:34.000000000 +0200 +++ /var/tmp/diff_new_pack.F15808/_new 2007-07-30 20:50:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autogen (Version 5.9.1) +# spec file for package autogen (Version 5.9.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,10 +13,10 @@ Name: autogen BuildRequires: guile-devel libxml2-devel Summary: Automated Text File Generator -Version: 5.9.1 +Version: 5.9.2 Release: 1 Group: Development/Tools/Building -License: GNU General Public License (GPL) +License: GPL v2 or later URL: http://autogen.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 #Patch: %{name}-%{version}.diff @@ -71,6 +71,17 @@ %{_infodir}/*.gz %changelog +* Mon Jul 30 2007 - schwab(a)suse.de +- Update to autogen 5.9.2. + * GNU GPL v3 is now emitted with the "gpl" and "lgpl" functions. + * usage.tpl template has been added. + * getopt.tpl uses this template for constructing its usage string. + * if "short-usage" or "full-usage" can be used to specify the form + of the usage text: + * not supplied -> compute it at run time + * supplied, but empty -> use "usage.tpl" to compute it + * is a variable name -> insert into option structure + * is text -> emit the text and point to it from option structure * Mon May 07 2007 - schwab(a)suse.de - Update to autogen 5.9.1. * getopt.tpl template is fixed to not require the internal header ++++++ autogen-5.9.1.tar.bz2 -> autogen-5.9.2.tar.bz2 ++++++ ++++ 24954 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 acpid
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package acpid checked in at Mon Jul 30 20:37:10 CEST 2007. -------- --- acpid/acpid.changes 2007-07-30 16:23:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/acpid/acpid.changes 2007-07-30 19:06:38.000000000 +0200 @@ -4 +4 @@ -- fix "--skip-unsupported" warnings on module load (b.n.c #295308) +- fix "--skip-unsupported" warnings on module load (b.n.c #293758) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ --- /var/tmp/diff_new_pack.W19499/_old 2007-07-30 20:37:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W19499/_new 2007-07-30 20:37:01.000000000 +0200 @@ -13,7 +13,7 @@ Name: acpid URL: http://acpid.sourceforge.net/ Version: 1.0.6 -Release: 8 +Release: 9 %define acpi_version 0.09 License: GPL v2 or later Group: System/Daemons @@ -117,7 +117,7 @@ %changelog * Mon Jul 30 2007 - seife(a)suse.de -- fix "--skip-unsupported" warnings on module load (b.n.c #295308) +- fix "--skip-unsupported" warnings on module load (b.n.c #293758) * Tue Jul 03 2007 - seife(a)suse.de - update to version 1.0.6 mostly our patches included upstream ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libarchive
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package libarchive checked in at Mon Jul 30 20:31:12 CEST 2007. -------- --- libarchive/libarchive.changes 2007-06-08 01:36:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/libarchive/libarchive.changes 2007-07-30 16:37:54.961836000 +0200 @@ -1,0 +2,13 @@ +Mon Jul 30 14:31:32 CEST 2007 - mrueckert(a)suse.de + +- update to 2.2.5 (#291358) + This is a major version bump. For a full list of all changes see + /usr/share/doc/packages/libarchive/NEWS. Mostly notable this up- + date includes the fixes for the following security bugs: + Errors handling corrupt tar files in libarchive + (CVE-2007-3641, CVE-2007-3644, CVE-2007-3645) +- added libarchive-2.2.5_rpath.patch: + dont set a rpath on the builddir. +- no longer building the static lib + +------------------------------------------------------------------- @@ -7,0 +21,12 @@ +Sun Apr 8 20:53:59 CEST 2007 - mrueckert(a)suse.de + +- updated to 2.0.28 +- removed all patches: + included upstream + +------------------------------------------------------------------- +Sat Mar 24 20:07:04 CET 2007 - mrueckert(a)suse.de + +- require libbz2-devel on >= 10.3 + +------------------------------------------------------------------- Old: ---- bsdtar-1.2.53_testsuite.patch bsdtar-1.3.1_linux_fs_includes.patch libarchive-1.3.1.tar.gz SA-06-24_libarchive.patch New: ---- libarchive-2.2.5_rpath.patch libarchive-2.2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libarchive.spec ++++++ --- /var/tmp/diff_new_pack.sv5838/_old 2007-07-30 20:30:22.000000000 +0200 +++ /var/tmp/diff_new_pack.sv5838/_new 2007-07-30 20:30:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libarchive (Version 1.3.1) +# spec file for package libarchive (Version 2.2.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,20 +11,23 @@ # norootforbuild Name: libarchive -Version: 1.3.1 -Release: 28 +Version: 2.2.5 +Release: 1 # -License: BSD License and BSD-like +License: BSD 3-Clause Group: Development/Libraries/C and C++ # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libacl-devel libbz2-devel zlib-devel +BuildRequires: libacl-devel zlib-devel +%if 0%{?suse_version} > 1020 +BuildRequires: libbz2-devel +%else +BuildRequires: bzip2 +%endif # URL: http://people.freebsd.org/~kientzle/libarchive/ -Source0: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.ta… -Patch: bsdtar-1.3.1_linux_fs_includes.patch -Patch1: bsdtar-1.2.53_testsuite.patch -Patch2: SA-06-24_libarchive.patch +Source: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.ta… +Patch: libarchive-2.2.5_rpath.patch # Summary: Programming Library To Create And Read Several Different Streaming Archive Formats @@ -89,7 +92,12 @@ %package devel Requires: %{name} == %{version} -Requires: libbz2-devel zlib-devel libacl-devel bsdtar +Requires: zlib-devel libacl-devel bsdtar +%if 0%{?suse_version} > 1020 +Requires: libbz2-devel +%else +Requires: bzip2 +%endif Group: Development/Libraries/C and C++ Summary: Development files for libarchive. @@ -112,7 +120,7 @@ %package -n bsdtar Group: Development/Libraries/C and C++ -Summary: bsdtar is a programm that can create and read several different streaming archive formats +Summary: Bsdtar is a programm that can create and read several different streaming archive formats %description -n bsdtar Libarchive is a programming library that can create and read several @@ -134,19 +142,14 @@ %prep %setup %patch -%patch1 -%patch2 %build -autoreconf -i -export CFLAGS="%{optflags} -fno-strict-aliasing" -%configure +autoreconf -fi +%configure --disable-static %{__make} -pushd tar/test/ -%{__ln_s} /bin/tar gtar -export PATH="$PWD:$PATH" - sh -x test.sh -popd + +%check +%{__make} check %install %makeinstall @@ -161,13 +164,12 @@ %files %defattr(-,root,root) -%{_libdir}/%{name}.so.1* -%doc COPYING INSTALL NEWS README minitar +%{_libdir}/%{name}.so.* +%doc COPYING INSTALL NEWS README examples/ %files devel %defattr(-,root,root) %{_mandir}/man?/* -%{_libdir}/%{name}.a %{_libdir}/%{name}.la %{_libdir}/%{name}.so %{_includedir}/archive* @@ -177,9 +179,25 @@ %{_bindir}/bsdtar %changelog +* Mon Jul 30 2007 - mrueckert(a)suse.de +- update to 2.2.5 (#291358) + This is a major version bump. For a full list of all changes see + /usr/share/doc/packages/libarchive/NEWS. Mostly notable this up- + date includes the fixes for the following security bugs: + Errors handling corrupt tar files in libarchive + (CVE-2007-3641, CVE-2007-3644, CVE-2007-3645) +- added libarchive-2.2.5_rpath.patch: + dont set a rpath on the builddir. +- no longer building the static lib * Fri Jun 08 2007 - ro(a)suse.de - added ldconfig to post scripts - remove minitar objects (leave binary there for now) +* Sun Apr 08 2007 - mrueckert(a)suse.de +- updated to 2.0.28 +- removed all patches: + included upstream +* Sat Mar 24 2007 - mrueckert(a)suse.de +- require libbz2-devel on >= 10.3 * Sat Mar 24 2007 - aj(a)suse.de - Change requires for libbz2 split. * Tue Mar 06 2007 - mrueckert(a)suse.de ++++++ libarchive-2.2.5_rpath.patch ++++++ Index: Makefile.am =================================================================== --- Makefile.am.orig 2007-07-12 17:49:04.000000000 +0200 +++ Makefile.am 2007-07-30 14:54:43.472469271 +0200 @@ -204,8 +204,8 @@ bsdtar_DEPENDENCIES = libarchive.la \ libarchive/archive_entry.h \ libarchive/archive.h -bsdtar_LDADD= -larchive +#bsdtar_LDADD= libarchive.la bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive # Link libarchive statically... -bsdtar_LDFLAGS= -static -I$(destdir)/libarchive +bsdtar_LDFLAGS= -I$(top_builddir)/libarchive libarchive.la bsdtar_dist_man_MANS= tar/bsdtar.1 ++++++ libarchive-1.3.1.tar.gz -> libarchive-2.2.5.tar.gz ++++++ ++++ 85889 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 jack-rack
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package jack-rack checked in at Mon Jul 30 20:30:16 CEST 2007. -------- --- jack-rack/jack-rack.changes 2007-05-03 13:43:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/jack-rack/jack-rack.changes 2007-07-30 15:30:54.000000000 +0200 @@ -1,0 +2,32 @@ +Mon Jul 30 15:26:48 CEST 2007 - tiwai(a)suse.de + +- updated to verison 1.4.5: + * JACK connection loss now employs automatic reconnect + * widgets controlled via MIDI now get all their channels updated + * added more translation + * corrected MIDI controller numbering + * internal: introduced flexible status and error handlers + * Use the new GTK about dialog and toolbar APIs + * Use the correct dialogs when opening and saving files. + * Disconnect safely from JACK upon shutdown + * Make the configure script check for the LADSPA header. + * Fix LASH support + +- updated to version 1.4.6: + * Updated translations + * More robustness for buggy LADSPA plugins + * Installation fixes + * Allow effects to be toggled on and off by MIDI + * Assign default control values to the correct controls + * Experimental support for 14-bit MIDI control messages + * Allow the range of values that MIDI controls cover to be + chosen + * Ellipsize the text in the splash screen + * When the RDF description of a plugin contains named points, + show the value as a combo box + * Added a script (ecarack) to run an approximation of a JACK Rack + config using ecasound + * Fix a bug with integer controls where they'd only set the first + channel's value when locked. + +------------------------------------------------------------------- Old: ---- jack-rack-1.4.4.tar.bz2 jack-rack-gcc4-fix.diff jack-rack-gettext.dif jack-rack-inc-fix.dif jack-rack-warning-fix.diff New: ---- jack-rack-1.4.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jack-rack.spec ++++++ --- /var/tmp/diff_new_pack.Uc2928/_old 2007-07-30 20:29:19.000000000 +0200 +++ /var/tmp/diff_new_pack.Uc2928/_new 2007-07-30 20:29:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package jack-rack (Version 1.4.4) +# spec file for package jack-rack (Version 1.4.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,17 +14,13 @@ BuildRequires: jack-devel ladspa-devel libgnomeui-devel liblrdf-devel libraptor-devel mDNSResponder-devel update-desktop-files %define _prefix /usr Summary: LADSPA Effects Rack for JACK -Version: 1.4.4 -Release: 75 -License: GNU General Public License (GPL) +Version: 1.4.6 +Release: 1 +License: GPL v2 or later Group: Productivity/Multimedia/Sound/Utilities Requires: jack ladspa Source: %{name}-%{version}.tar.bz2 -Patch: jack-rack-gettext.dif -Patch1: jack-rack-inc-fix.dif -Patch2: jack-rack-undeprec.dif -Patch3: jack-rack-gcc4-fix.diff -Patch4: jack-rack-warning-fix.diff +Patch: jack-rack-undeprec.dif URL: http://jack-rack.sf.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,34 +36,25 @@ Bob Ham <node(a)users.sourceforge.net> %prep -%setup +%setup -q %patch -%patch1 -%patch2 -%patch3 -%patch4 %build %{?suse_update_config:%{suse_update_config -f}} -# gettextize --force --copy -autoreconf --force --install -test -f po/Makevars || mv po/Makevars.template po/Makevars -CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ +autoreconf -fi +%configure \ --disable-desktop-inst make %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall %suse_update_desktop_file jack-rack AudioVideo Music +%find_lang %{name} %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO %{_bindir}/* @@ -76,9 +63,36 @@ %{_datadir}/dtds/* %{_datadir}/jack-rack %{_datadir}/pixmaps/*.png -%{_datadir}/locale/*/*/* %changelog +* Mon Jul 30 2007 - tiwai(a)suse.de +- updated to verison 1.4.5: + * JACK connection loss now employs automatic reconnect + * widgets controlled via MIDI now get all their channels updated + * added more translation + * corrected MIDI controller numbering + * internal: introduced flexible status and error handlers + * Use the new GTK about dialog and toolbar APIs + * Use the correct dialogs when opening and saving files. + * Disconnect safely from JACK upon shutdown + * Make the configure script check for the LADSPA header. + * Fix LASH support +- updated to version 1.4.6: + * Updated translations + * More robustness for buggy LADSPA plugins + * Installation fixes + * Allow effects to be toggled on and off by MIDI + * Assign default control values to the correct controls + * Experimental support for 14-bit MIDI control messages + * Allow the range of values that MIDI controls cover to be + chosen + * Ellipsize the text in the splash screen + * When the RDF description of a plugin contains named points, + show the value as a combo box + * Added a script (ecarack) to run an approximation of a JACK Rack + config using ecasound + * Fix a bug with integer controls where they'd only set the first + channel's value when locked. * Thu May 03 2007 - wstephenson(a)suse.de - libraptor1-devel -> libraptor-devel * Thu May 03 2007 - lrupp(a)suse.de ++++++ jack-rack-1.4.4.tar.bz2 -> jack-rack-1.4.6.tar.bz2 ++++++ ++++ 37529 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 dmraid
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package dmraid checked in at Mon Jul 30 20:29:12 CEST 2007. -------- --- dmraid/dmraid.changes 2007-07-10 10:59:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/dmraid/dmraid.changes 2007-07-30 13:34:38.818715000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 30 13:34:11 CEST 2007 - hare(a)suse.de + +- Do not activate partitions from dmraid; udev handles it. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmraid.spec ++++++ --- /var/tmp/diff_new_pack.ya1892/_old 2007-07-30 20:28:46.000000000 +0200 +++ /var/tmp/diff_new_pack.ya1892/_new 2007-07-30 20:28:46.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: A Device-Mapper Software RAID Support Tool Version: 1.0.0.rc14 -Release: 1 +Release: 7 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Source1: sysconfig.dmraid Source2: boot.dmraid @@ -114,6 +114,8 @@ /etc/init.d/boot.dmraid %changelog +* Mon Jul 30 2007 - hare(a)suse.de +- Do not activate partitions from dmraid; udev handles it. * Tue Jul 10 2007 - mkoenig(a)suse.de - update to version 1.0.0.rc14 * bugfix release ++++++ boot.dmraid ++++++ --- dmraid/boot.dmraid 2007-06-19 13:32:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/dmraid/boot.dmraid 2007-07-30 13:34:09.400726000 +0200 @@ -39,7 +39,7 @@ /sbin/udevsettle --timeout=$DMRAID_DEVICE_TIMEOUT fi echo "Activating dmraid..." - $DMRAID -ay $DMRAID_START_OPTIONS + $DMRAID -ay -p $DMRAID_START_OPTIONS rc_status -v -r ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dhcp
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package dhcp checked in at Mon Jul 30 20:28:04 CEST 2007. -------- --- dhcp/dhcp.changes 2007-07-19 16:14:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/dhcp.changes 2007-07-30 13:07:22.745584000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 30 13:06:43 CEST 2007 - thoenig(a)suse.de + +- dhcp-3.0.3-dhclient-script-dhcdbd.patch: dbus-send is now located + in /bin + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.y31688/_old 2007-07-30 20:27:08.000000000 +0200 +++ /var/tmp/diff_new_pack.y31688/_new 2007-07-30 20:27:08.000000000 +0200 @@ -23,7 +23,7 @@ Group: Productivity/Networking/Boot/Servers Autoreqprov: on Version: 3.0.6 -Release: 1 +Release: 6 Summary: Common Files Used by ISC DHCP Software URL: http://www.isc.org/isc/dhcp.html Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz @@ -486,6 +486,9 @@ %doc %{_mandir}/man3/dhcpctl.3.gz %changelog +* Mon Jul 30 2007 - thoenig(a)suse.de +- dhcp-3.0.3-dhclient-script-dhcdbd.patch: dbus-send is now located + in /bin * Thu Jul 19 2007 - mt(a)suse.de - Updated to 3.0.6, a maintenance release containing fixes for bugs discovered since DHCP 3.0.5, but no new features. ++++++ dhcp-3.0.3-dhclient-script-dhcdbd.patch ++++++ --- /var/tmp/diff_new_pack.y31688/_old 2007-07-30 20:27:08.000000000 +0200 +++ /var/tmp/diff_new_pack.y31688/_new 2007-07-30 20:27:08.000000000 +0200 @@ -5,7 +5,7 @@ fi +if [ -n "${dhc_dbus}" ]; then -+ /usr/bin/dbus-send \ ++ /bin/dbus-send \ + --system \ + --dest=com.redhat.dhcp \ + --type=method_call \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gphotofs
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package gphotofs checked in at Mon Jul 30 20:24:39 CEST 2007. -------- --- GNOME/gphotofs/gphotofs.changes 2007-01-15 14:31:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/gphotofs/gphotofs.changes 2007-07-30 12:56:28.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 30 09:12:00 CEST 2007 - meissner(a)suse.de + +- sync to upstream 0.4.0 + - ported code to work with fuse 2.5 too. + - some small bugfixes + +------------------------------------------------------------------- Old: ---- gphotofs-0.3.0.trunk.4.tar.bz2 New: ---- gphotofs-0.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gphotofs.spec ++++++ --- /var/tmp/diff_new_pack.Z23449/_old 2007-07-30 20:23:35.000000000 +0200 +++ /var/tmp/diff_new_pack.Z23449/_new 2007-07-30 20:23:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gphotofs (Version 0.3.0.trunk.4) +# spec file for package gphotofs (Version 0.4.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,10 +14,10 @@ BuildRequires: fuse-devel glib2-devel libgphoto2-devel libjpeg-devel URL: http://gphoto.sourceforge.net %define prefix /usr -License: GNU General Public License (GPL) -Group: Hardware/Other +License: GPL v2 or later +Group: Hardware/Camera Summary: User Level File System for gphoto-Based Cameras -Version: 0.3.0.trunk.4 +Version: 0.4.0 Release: 1 Source0: gphotofs-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,7 +85,11 @@ %defattr(-,root,root) /usr/bin/gphotofs -%changelog -n gphotofs +%changelog +* Mon Jul 30 2007 - meissner(a)suse.de +- sync to upstream 0.4.0 + - ported code to work with fuse 2.5 too. + - some small bugfixes * Mon Jan 15 2007 - meissner(a)suse.de - upgraded to current trunk. - write support, mkdir, rmdir added ++++++ gphotofs-0.3.0.trunk.4.tar.bz2 -> gphotofs-0.4.0.tar.bz2 ++++++ ++++ 2240 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/gphotofs-0.3.0.trunk.4/ChangeLog new/gphotofs-0.4.0/ChangeLog --- old/gphotofs-0.3.0.trunk.4/ChangeLog 2007-01-15 13:35:16.000000000 +0100 +++ new/gphotofs-0.4.0/ChangeLog 2007-07-27 09:37:09.000000000 +0200 @@ -1,3 +1,23 @@ +2007-01-24 Marcus Meissner <marcus(a)jet.franken.de> + + * gphotofs.c: Rev down to fuse 2.5 requirement, + inject -s instead. + + * configure.ac: 2.3.0.trunk.5 + +2007-01-21 Marcus Meissner <marcus(a)jet.franken.de> + + * gphotofs.c: + - Use single threaded loop (libgphoto2 cannot cope + being accessed multithread currently). + + - Needed to use fuse version 2.6 for this (all + others fail one way or the other). + + - basic statfs support. + + - charset is always utf-8, because thats what the kernel uses. + 2007-01-14 Marcus Meissner <marcus(a)jet.franken.de> * gphotofs.c: Fixed the bugs in the upload code. 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/gphotofs-0.3.0.trunk.4/compile new/gphotofs-0.4.0/compile --- old/gphotofs-0.3.0.trunk.4/compile 2006-11-25 19:11:38.000000000 +0100 +++ new/gphotofs-0.4.0/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey(a)cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake(a)gnu.org> or send patches to -# <automake-patches(a)gnu.org>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake(a)gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gphotofs-0.3.0.trunk.4/configure.ac new/gphotofs-0.4.0/configure.ac --- old/gphotofs-0.3.0.trunk.4/configure.ac 2007-01-15 13:35:16.000000000 +0100 +++ new/gphotofs-0.4.0/configure.ac 2007-07-30 07:50:37.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([gphoto filesystem], [0.3.0.trunk.4], [gphoto-devel(a)lists.sourceforge.net], [gphotofs]) +AC_INIT([gphoto filesystem], [0.4.0], [gphoto-devel(a)lists.sourceforge.net], [gphotofs]) AC_CONFIG_SRCDIR([gphotofs.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([auto-aux]) @@ -31,7 +31,7 @@ GP_PKG_CONFIG -PKG_CHECK_MODULES([FUSE], [fuse >= 2.2]) +PKG_CHECK_MODULES([FUSE], [fuse >= 2.6]) AC_SUBST([FUSE_CFLAGS]) AC_SUBST([FUSE_LIBS]) @@ -39,7 +39,7 @@ AC_SUBST([GLIB_CFLAGS]) AC_SUBST([GLIB_LIBS]) -GP_CHECK_LIBRARY([LIBGPHOTO2], [libgphoto2], [>= 2.2.0]) +GP_CHECK_LIBRARY([LIBGPHOTO2], [libgphoto2], [>= 2.3.0]) ALL_LINGUAS="" GETTEXT_PACKAGE="gphotofs" 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/gphotofs-0.3.0.trunk.4/gphotofs.c new/gphotofs-0.4.0/gphotofs.c --- old/gphotofs-0.3.0.trunk.4/gphotofs.c 2007-01-15 13:35:16.000000000 +0100 +++ new/gphotofs-0.4.0/gphotofs.c 2007-07-27 09:37:10.000000000 +0200 @@ -35,7 +35,7 @@ static gint sSpeed = 0; static gboolean sHelp; -struct timeval glob_tv_zero; +static struct timeval glob_tv_zero; /* * The OpenFile struct encapsulates a CameraFile and an open count. @@ -339,7 +339,9 @@ } else { openFile->count++; } - } else if ((fi->flags & 3) == O_WRONLY) { + return 0; + } + if ((fi->flags & 3) == O_WRONLY) { openFile = g_hash_table_lookup(p->writes, path); if (!openFile) { gchar *dir = g_path_get_dirname(path); @@ -362,10 +364,9 @@ } else { openFile->count++; } - } else { - return -1; + return 0; } - return 0; + return -EINVAL; } static int @@ -462,8 +463,9 @@ ret = gp_camera_folder_remove_dir(p->camera, dir, file, p->context); if (ret != 0) { ret = gpresultToErrno(ret); + } else { + g_hash_table_remove(p->dirs, path); } - g_hash_table_remove(p->dirs, path); g_free(dir); g_free(file); return ret; @@ -557,6 +559,30 @@ return 0; } +static int gphotofs_statfs(const char *path, struct statvfs *stvfs) +{ + GPCtx *p = (GPCtx *)fuse_get_context()->private_data; + CameraStorageInformation *sifs; + int res, nrofsifs; + + res = gp_camera_get_storageinfo (p->camera, &sifs, &nrofsifs, p->context); + if (res < GP_OK) + return gpresultToErrno(res); + if (nrofsifs == 0) + return -ENOSYS; + + if (nrofsifs == 1) { + stvfs->f_bsize = 1024; + stvfs->f_blocks = sifs->capacitykbytes; + stvfs->f_bfree = sifs->freekbytes; + stvfs->f_bavail = sifs->freekbytes; + stvfs->f_files = -1; + stvfs->f_ffree = -1; + stvfs->f_favail = -1; + } + return 0; +} + static int gphotofs_release(const char *path, struct fuse_file_info *fi) @@ -602,7 +628,6 @@ } g_hash_table_remove(p->files, path); - exit: g_free(dir); g_free(file); @@ -629,10 +654,11 @@ fprintf (logfile, "%li.%06li %s(%i): ", sec, usec, domain, level); vfprintf (logfile, format, args); fputc ('\n', logfile); + fflush (logfile); } static void * -gphotofs_init(void) +gphotofs_init() { int ret = GP_OK; GPCtx *p = g_new0(GPCtx, 1); @@ -641,17 +667,20 @@ int fd = -1; FILE *f = NULL; - fd = open("/tmp/gpfs.log",O_WRONLY|O_CREAT|O_EXCL,0600); + fd = open("/tmp/gpfs.log",O_WRONLY|O_CREAT,0600); if (fd != -1) { f = fdopen(fd,"a"); if (f) p->debug_func_id = gp_log_add_func (GP_LOG_ALL, debug_func, (void *) f); } + fprintf (f, "log opened on pid %d\n", getpid()); #endif p->context = gp_context_new(); gettimeofday (&glob_tv_zero, NULL); + setlocale (LC_CTYPE,"en_US.UTF-8"); /* for ptp2 driver to convert to utf-8 */ + gp_camera_new (&p->camera); gp_abilities_list_new(&p->abilities); @@ -810,15 +839,17 @@ .release = gphotofs_release, .unlink = gphotofs_unlink, - .write = gphotofs_write, + .write = gphotofs_write, .mkdir = gphotofs_mkdir, .rmdir = gphotofs_rmdir, - .mknod = gphotofs_mknod, - .flush = gphotofs_flush, - .fsync = gphotofs_fsync, + .mknod = gphotofs_mknod, + .flush = gphotofs_flush, + .fsync = gphotofs_fsync, - .chmod = gphotofs_chmod, - .chown = gphotofs_chown, + .chmod = gphotofs_chmod, + .chown = gphotofs_chown, + + .statfs = gphotofs_statfs }; static GOptionEntry options[] = @@ -842,13 +873,18 @@ g_option_context_parse(context, &argc, &argv, &error); if (sHelp) { - const char *fusehelp[] = { g_get_prgname(), "-ho", NULL}; + const char *fusehelp[] = { argv[0], "-ho", NULL}; return fuse_main(2, (char **)fusehelp, &gphotofs_oper); } else if (sUsbid) { g_fprintf(stderr, "--usbid is not yet implemented\n"); return 1; } else { - return fuse_main(argc, argv, &gphotofs_oper); + char **newargv = malloc ( (argc+2)*sizeof(char*)); + memcpy (newargv+2,argv+1,sizeof(char*)*(argc-1)); + newargv[0] = argv[0]; + newargv[1] = "-s"; /* disable multithreading */ + + return fuse_main(argc+1, newargv, &gphotofs_oper); } } 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/gphotofs-0.3.0.trunk.4/INSTALL new/gphotofs-0.4.0/INSTALL --- old/gphotofs-0.3.0.trunk.4/INSTALL 2006-09-04 14:57:58.000000000 +0200 +++ new/gphotofs-0.4.0/INSTALL 2007-07-30 09:09:37.000000000 +0200 @@ -1,13 +1,16 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Installation Instructions +************************* - This file is free documentation; the Free Software Foundation gives +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -67,9 +70,9 @@ Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -82,7 +85,7 @@ Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -99,19 +102,19 @@ Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -122,7 +125,7 @@ Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,11 +140,11 @@ Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -156,7 +159,7 @@ need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will +use the option `--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -167,9 +170,9 @@ Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -178,7 +181,7 @@ Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -186,14 +189,18 @@ ./configure CC=/usr/local2/bin/gcc -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' 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/gphotofs-0.3.0.trunk.4/m4m/gp-autogen-subdir.m4 new/gphotofs-0.4.0/m4m/gp-autogen-subdir.m4 --- old/gphotofs-0.3.0.trunk.4/m4m/gp-autogen-subdir.m4 2007-01-15 13:35:27.000000000 +0100 +++ new/gphotofs-0.4.0/m4m/gp-autogen-subdir.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -dnl @synopsis GP_AUTOGEN_SUBDIRS([subdir]) -dnl -dnl This macro takes a single subdirectory as parameter. -dnl It is read by autogen.sh to determine the subdirectories autogen.sh -dnl is to initialize, so there is nothing to do at configure time. -dnl -AC_DEFUN([GP_AUTOGEN_SUBDIRS],[])dnl -AC_DEFUN([GP_AUTOGEN_SUBDIR],[])dnl -dnl - -dnl Please do not remove this: -dnl filetype: 7a83e79c-50a5-48de-9944-b2547e0be639 -dnl I use this to find all the different instances of this file which -dnl are supposed to be synchronized. - -dnl Local Variables: -dnl mode: autoconf -dnl End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gphotofs-0.3.0.trunk.4/m4m/gp-check-doxygen.m4 new/gphotofs-0.4.0/m4m/gp-check-doxygen.m4 --- old/gphotofs-0.3.0.trunk.4/m4m/gp-check-doxygen.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/gphotofs-0.4.0/m4m/gp-check-doxygen.m4 2007-07-27 09:38:37.000000000 +0200 @@ -0,0 +1,21 @@ +dnl doxygen related stuff +dnl look for tools +dnl define substitutions for Doxyfile.in +AC_DEFUN([GP_CHECK_DOXYGEN],[dnl +AC_REQUIRE([GP_CHECK_DOC_DIR])dnl +AC_PATH_PROG([DOT], [dot], [false]) +AC_PATH_PROG([DOXYGEN], [doxygen], [false]) +AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != "xfalse"]) +AM_CONDITIONAL([HAVE_DOT], [test "x$DOT" != "xfalse"]) +if test "x$DOT" != "xfalse"; then + AC_SUBST([HAVE_DOT],[YES]) +else + AC_SUBST([HAVE_DOT],[NO]) +fi +AC_SUBST([HTML_APIDOC_DIR], ["${PACKAGE_TARNAME}-api.html"]) +AC_SUBST([DOXYGEN_OUTPUT_DIR], [doxygen-output]) +AC_SUBST([HTML_APIDOC_INTERNALS_DIR], ["${PACKAGE_TARNAME}-internals.html"]) +])dnl + + + 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/gphotofs-0.3.0.trunk.4/m4m/gp-documentation.m4 new/gphotofs-0.4.0/m4m/gp-documentation.m4 --- old/gphotofs-0.3.0.trunk.4/m4m/gp-documentation.m4 2007-01-15 13:35:27.000000000 +0100 +++ new/gphotofs-0.4.0/m4m/gp-documentation.m4 2007-07-27 09:38:36.000000000 +0200 @@ -111,23 +111,3 @@ ])dnl - -dnl doxygen related stuff -dnl look for tools -dnl define substitutions for Doxyfile.in -AC_DEFUN([GP_CHECK_DOXYGEN],[dnl -AC_REQUIRE([GP_CHECK_DOC_DIR])dnl -AC_PATH_PROG([DOT], [dot], [false]) -AC_PATH_PROG([DOXYGEN], [doxygen], [false]) -AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != "xfalse"]) -AM_CONDITIONAL([HAVE_DOT], [test "x$DOT" != "xfalse"]) -if test "x$DOT" != "xfalse"; then - AC_SUBST([HAVE_DOT],[YES]) -else - AC_SUBST([HAVE_DOT],[NO]) -fi -AC_SUBST([HTML_APIDOC_DIR], ["${PACKAGE_TARNAME}-api.html"]) -AC_SUBST([DOXYGEN_OUTPUT_DIR], [doxygen-output]) -AC_SUBST([HTML_APIDOC_INTERNALS_DIR], ["${PACKAGE_TARNAME}-internals.html"]) -])dnl - 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/gphotofs-0.3.0.trunk.4/m4m/gp-libltdl.m4 new/gphotofs-0.4.0/m4m/gp-libltdl.m4 --- old/gphotofs-0.3.0.trunk.4/m4m/gp-libltdl.m4 2007-01-15 13:35:27.000000000 +0100 +++ new/gphotofs-0.4.0/m4m/gp-libltdl.m4 2007-07-27 09:38:37.000000000 +0200 @@ -29,4 +29,28 @@ fi AC_SUBST([LTDLINCL]) AC_SUBST([LIBLTDL]) +dnl +dnl Make sure we can actually compile and link against libltdl +AC_LANG_PUSH([C]) +AC_MSG_CHECKING([that we can compile and link with libltdl]) +saved_CPPFLAGS="$CPPFLAGS" +saved_LDFLAGS="$LDFLAGS" +CPPFLAGS="$CPPFLAGS $LTDLINCL" +LDFLAGS="$LDFLAGS $LIBLTDL" +AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl +#include <stdlib.h> /* for NULL */ +#include <ltdl.h> /* for lt_* */ +],[dnl +int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL); +])], [AC_MSG_RESULT([yes])], [dnl +AC_MSG_RESULT([no]) +AC_MSG_ERROR([cannot compile and link against libltdl +${PACKAGE_TARNAME} requires libltdl (the libtool dl* library), +but cannot compile and link against it. +Aborting. +]) +]) +CPPFLAGS="$saved_CPPFLAGS" +LDFLAGS="$saved_LDFLAGS" +AC_LANG_POP ])dnl 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/gphotofs-0.3.0.trunk.4/m4m/gp-manual-graphviz.m4 new/gphotofs-0.4.0/m4m/gp-manual-graphviz.m4 --- old/gphotofs-0.3.0.trunk.4/m4m/gp-manual-graphviz.m4 2007-01-15 13:35:27.000000000 +0100 +++ new/gphotofs-0.4.0/m4m/gp-manual-graphviz.m4 2007-07-27 09:38:36.000000000 +0200 @@ -7,7 +7,7 @@ try_dot=true have_dot=false -AC_ARG_WITH(dot, [ --without-dot Don't use dot],[ +AC_ARG_WITH(dot, AS_HELP_STRING([--without-dot], [Do not use dot]), [ if test "x$withval" = "xno"; then try_dot=false fi]) 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/gphotofs-0.3.0.trunk.4/m4m/gp-manual-pstoimg.m4 new/gphotofs-0.4.0/m4m/gp-manual-pstoimg.m4 --- old/gphotofs-0.3.0.trunk.4/m4m/gp-manual-pstoimg.m4 2007-01-15 13:35:27.000000000 +0100 +++ new/gphotofs-0.4.0/m4m/gp-manual-pstoimg.m4 2007-07-27 09:38:36.000000000 +0200 @@ -4,11 +4,11 @@ dnl --------------------------------------------------------------------------- AC_DEFUN([GP_CHECK_PSTOIMG], [ -AC_REQUIRE([GP_CHECK_DOT]) +AC_REQUIRE([GP_CHECK_DOT])dnl for creating tesseract.ps try_pstoimg=true have_pstoimg=false -AC_ARG_WITH(pstoimg, [ --without-pstoimg Don't use pstoimg],[ +AC_ARG_WITH(pstoimg, AS_HELP_STRING([--without-pstoimg], [Do not use pstoimg]),[ if test "x$withval" = "xno"; then try_pstoimg=false fi]) @@ -29,6 +29,7 @@ else AC_MSG_RESULT(yes) fi + rm -f tesseract.png fi AM_CONDITIONAL(ENABLE_PSTOIMG, $have_pstoimg) 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/gphotofs-0.3.0.trunk.4/m4m/gp-udev.m4 new/gphotofs-0.4.0/m4m/gp-udev.m4 --- old/gphotofs-0.3.0.trunk.4/m4m/gp-udev.m4 2007-01-15 13:35:27.000000000 +0100 +++ new/gphotofs-0.4.0/m4m/gp-udev.m4 2007-07-27 09:38:36.000000000 +0200 @@ -1,5 +1,5 @@ AC_DEFUN([GP_UDEV],[dnl -udevscriptdir="\${libdir}/udev" +if test "x${udevscriptdir}" = "x"; then udevscriptdir="\${libdir}/udev"; fi AC_ARG_VAR([udevscriptdir],[Directory where udev scripts like check-ptp-camere will be installed]) AC_SUBST([udevscriptdir]) ])dnl 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/gphotofs-0.3.0.trunk.4/m4m/Makefile.am new/gphotofs-0.4.0/m4m/Makefile.am --- old/gphotofs-0.3.0.trunk.4/m4m/Makefile.am 2007-01-15 13:35:27.000000000 +0100 +++ new/gphotofs-0.4.0/m4m/Makefile.am 2007-07-27 09:38:37.000000000 +0200 @@ -1 +1 @@ -EXTRA_DIST = gp-autogen-subdir.m4 gp-byteorder.m4 gp-camlibs.m4 gp-check-library.m4 gp-check-popt.m4 gp-check-shell-environment.m4 gp-config-msg.m4 gp-documentation.m4 gp-dynamic-libraries.m4 gp-gettext-hack.m4 gp-libltdl.m4 gp-manual-docbook-xml.m4 gp-manual-documentation.m4 gp-manual-fig2dev.m4 gp-manual-graphviz.m4 gp-manual-gtk-doc.m4 gp-manual-pstoimg.m4 gp-manual-w3m.m4 gp-packaging.m4 gp-pkg-config.m4 gp-references.m4 gp-stdint.m4 gp-udev.m4 gp-va-copy.m4 README.m4 +EXTRA_DIST = gp-byteorder.m4 gp-camlibs.m4 gp-check-doxygen.m4 gp-check-library.m4 gp-check-popt.m4 gp-check-shell-environment.m4 gp-config-msg.m4 gp-documentation.m4 gp-dynamic-libraries.m4 gp-gettext-hack.m4 gp-libltdl.m4 gp-manual-docbook-xml.m4 gp-manual-documentation.m4 gp-manual-fig2dev.m4 gp-manual-graphviz.m4 gp-manual-gtk-doc.m4 gp-manual-pstoimg.m4 gp-manual-w3m.m4 gp-packaging.m4 gp-pkg-config.m4 gp-references.m4 gp-stdint.m4 gp-udev.m4 gp-va-copy.m4 README.m4 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/gphotofs-0.3.0.trunk.4/Makefile.am new/gphotofs-0.4.0/Makefile.am --- old/gphotofs-0.3.0.trunk.4/Makefile.am 2007-01-15 13:35:16.000000000 +0100 +++ new/gphotofs-0.4.0/Makefile.am 2007-07-27 09:37:10.000000000 +0200 @@ -10,7 +10,7 @@ gphotofs_SOURCES = gphotofs.c gphotofs_CPPFLAGS = \ $(AM_CPPFLAGS) $(CPPFLAGS) \ - -DFUSE_USE_VERSION=22 $(FUSE_CFLAGS) \ + -DFUSE_USE_VERSION=25 $(FUSE_CFLAGS) \ $(GLIB_CFLAGS) \ $(LIBGPHOTO2_CFLAGS) gphotofs_LDADD = \ 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/gphotofs-0.3.0.trunk.4/missing new/gphotofs-0.4.0/missing --- old/gphotofs-0.3.0.trunk.4/missing 2006-11-25 19:11:38.000000000 +0100 +++ new/gphotofs-0.4.0/missing 1970-01-01 01:00:00.000000000 +0100 @@ -1,360 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2005-06-08.21 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - 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 - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to <bug-automake(a)gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# 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 - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - 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'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - 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 - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - 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 - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`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 - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - 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'` - 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` - # ... 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 - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gphotofs-0.3.0.trunk.4/NEWS new/gphotofs-0.4.0/NEWS --- old/gphotofs-0.3.0.trunk.4/NEWS 2006-09-04 14:57:58.000000000 +0200 +++ new/gphotofs-0.4.0/NEWS 2007-07-30 07:50:37.000000000 +0200 @@ -1,3 +1,12 @@ +What's new in 0.4 +----------------- + +- Statfs support +- FUSE 2.6 API +- Single threaded main loop +- Write support +- mkdir/rmdir + What's new in 0.3 ----------------- 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/gphotofs-0.3.0.trunk.4/README new/gphotofs-0.4.0/README --- old/gphotofs-0.3.0.trunk.4/README 2007-01-15 13:35:16.000000000 +0100 +++ new/gphotofs-0.4.0/README 2007-07-27 09:37:10.000000000 +0200 @@ -64,14 +64,15 @@ - Mount the filesystem before plugging in a camera. - Add/Remove directories - Add (upload) files. - -You cannot: -- Modify files still has some problems. -- Rename files/directories - Get free space information - This one seems to be very much at the mercy of the camera manufacturer. I don't know if it'll ever be possible in a general way. + (Depends on gp_camera_get_storageinfo()). + +You cannot: +- Modify files still has some problems. +- Rename files/directories - Unplug and replug a camera and expect things to keep working. - The backend gets confused and you'll just get errors when you try to do anything. Unmount and remount the filesystem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wwwoffle
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package wwwoffle checked in at Mon Jul 30 20:23:28 CEST 2007. -------- --- wwwoffle/wwwoffle.changes 2007-03-29 22:35:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/wwwoffle/wwwoffle.changes 2007-07-30 16:08:27.686965000 +0200 @@ -1,0 +2,46 @@ +Mon Jul 30 16:04:10 CEST 2007 - kssingvo(a)suse.de + +- Upgrade to version 2.9c: + * src/htmlmodify.l, src/html.l: + Find the end of the script by searching for "</script". + * src/certificates.c: + Add some more information to the fatal error messages. + * doc/README.CONF: Grammatical correction and clarification. + * src/https.c: Don't try securing link if socket connection failed. + * src/sockets6.c: + Use the AI_ADDRCONFIG flag when calling getaddrinfo(). + * src/configmisc.c: + Fix bug with case-insensitive wildcard matching in the + configuration file + * src/info.c: Fix some warnings & errors splint detected. + * src/certificates.c, src/certinfo.c: + Add some splint annotations, fix some warnings & errors splint + detected. + * src/certificates.h, src/iopriv.h, src/io.h: + Add some splint annotations. + * src/connect.c: Fix memory leak. + * src/connect.c: Remove some dead code and trivial bug fix. + * src/cgi.c, src/certinfo.c: + More changes for compilation warnings on a system where + size_t!=int + * src/wwwoffles.c: + Defer de-initialisation of chunked or compressed sockets + until end to ensure memory is freed. + * src/certinfo.c: Free memory. + * src/certificates.c: + De-initialise gnutls data structures to free memory. + * src/finger.c: Make code same as http.c for opening socket + connection. + * src/info.c: + Fix problems with cached page contents info if it is being + stored compressed. + * src/iopriv.c: Fix comment error. + * src/wwwoffled.c: + Print message when ready to start after initialisation. + * src/document.c: Free allocated memory. + * src/io.c: Free memory at file close. + * src/certificates.c: Free memory at exit. + * src/errors.c: Don't truncate the log file when opening it. + * src/version.h, doc/NEWS: Update for version 2.9c. + +------------------------------------------------------------------- Old: ---- wwwoffle-2.9b.tar.bz2 New: ---- wwwoffle-2.9c.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wwwoffle.spec ++++++ --- /var/tmp/diff_new_pack.D19277/_old 2007-07-30 20:20:42.000000000 +0200 +++ /var/tmp/diff_new_pack.D19277/_new 2007-07-30 20:20:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wwwoffle (Version 2.9b) +# spec file for package wwwoffle (Version 2.9c) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,13 +12,13 @@ Name: wwwoffle BuildRequires: flex htdig -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Networking/Web/Proxy Autoreqprov: on Summary: World Wide Web Offline Proxy URL: http://www.gedanken.demon.co.uk/wwwoffle/ -Version: 2.9b -Release: 7 +Version: 2.9c +Release: 1 Source0: http://www.gedanken.freeserve.co.uk/download-wwwoffle/%name-%version.tar.bz2 Source1: rc.%name Source3: ip-up.%name @@ -97,6 +97,7 @@ popd rm -rf $RPM_BUILD_ROOT/usr/doc/wwwoffle rm -rf $RPM_BUILD_ROOT/var/spool/wwwoffle/outgoing/* +rm -f doc/ANNOUNCE~ %post %fillup_and_insserv wwwoffle @@ -176,6 +177,49 @@ /etc/ppp/ip-down.d/%name %changelog +* Mon Jul 30 2007 - kssingvo(a)suse.de +- Upgrade to version 2.9c: + * src/htmlmodify.l, src/html.l: + Find the end of the script by searching for "</script". + * src/certificates.c: + Add some more information to the fatal error messages. + * doc/README.CONF: Grammatical correction and clarification. + * src/https.c: Don't try securing link if socket connection failed. + * src/sockets6.c: + Use the AI_ADDRCONFIG flag when calling getaddrinfo(). + * src/configmisc.c: + Fix bug with case-insensitive wildcard matching in the + configuration file + * src/info.c: Fix some warnings & errors splint detected. + * src/certificates.c, src/certinfo.c: + Add some splint annotations, fix some warnings & errors splint + detected. + * src/certificates.h, src/iopriv.h, src/io.h: + Add some splint annotations. + * src/connect.c: Fix memory leak. + * src/connect.c: Remove some dead code and trivial bug fix. + * src/cgi.c, src/certinfo.c: + More changes for compilation warnings on a system where + size_t!=int + * src/wwwoffles.c: + Defer de-initialisation of chunked or compressed sockets + until end to ensure memory is freed. + * src/certinfo.c: Free memory. + * src/certificates.c: + De-initialise gnutls data structures to free memory. + * src/finger.c: Make code same as http.c for opening socket + connection. + * src/info.c: + Fix problems with cached page contents info if it is being + stored compressed. + * src/iopriv.c: Fix comment error. + * src/wwwoffled.c: + Print message when ready to start after initialisation. + * src/document.c: Free allocated memory. + * src/io.c: Free memory at file close. + * src/certificates.c: Free memory at exit. + * src/errors.c: Don't truncate the log file when opening it. + * src/version.h, doc/NEWS: Update for version 2.9c. * Thu Mar 29 2007 - ro(a)suse.de - added flex to buildreq * Mon Feb 19 2007 - kssingvo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 qemu
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package qemu checked in at Mon Jul 30 20:20:34 CEST 2007. -------- --- qemu/qemu.changes 2007-07-10 15:44:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/qemu.changes 2007-07-30 18:04:18.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 30 18:04:08 CEST 2007 - uli(a)suse.de + +- fixed for S/390 + +------------------------------------------------------------------- New: ---- qemu-s390.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.u15214/_old 2007-07-30 20:18:41.000000000 +0200 +++ /var/tmp/diff_new_pack.u15214/_new 2007-07-30 20:18:41.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Emulators/PC Summary: Universal CPU emulator Version: 0.9.0.cvs -Release: 1 +Release: 9 Source: %name-%version.tar.bz2 #Patch400: qemu-0.7.0-gcc4-dot-syms.patch #Patch401: qemu-0.8.0-gcc4-hacks.patch @@ -58,6 +58,7 @@ Patch68: qemu-0.8.3-gcc4.patch Patch69: qemu-cvs-ia64.patch Patch70: qemu-m68k.diff +Patch71: qemu-s390.patch Source200: kvm_bios.bin Source201: zx-rom.bin Source202: COPYING.zx-rom @@ -102,7 +103,7 @@ # this is to make lint happy Source300: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ppc sparc x86_64 ia64 +ExclusiveArch: %ix86 ppc sparc x86_64 ia64 s390 %description QEMU is an extremely well-performing CPU emulator that allows you to @@ -157,6 +158,7 @@ %patch67 -p1 %patch69 %patch70 +%patch71 -p1 %ifarch ia64 ppc64 #this is the dyngen for gcc4 patch (does not work on x86) %patch68 -p1 @@ -256,7 +258,12 @@ # build userland emus ./configure --prefix=/usr \ --interp-prefix=/usr/share/qemu/qemu-i386 \ - --enable-linux-user --disable-system --cc=%qemucc \ +%ifarch s390 # alpha-linux-user broken (ICE) + --target-list="i386-linux-user arm-linux-user armeb-linux-user sparc-linux-user ppc-linux-user mips-linux-user mipsel-linux-user m68k-linux-user" \ +%else + --enable-linux-user \ +%endif + --disable-system --cc=%qemucc \ --static --disable-gcc-check \ --extra-cflags="$QEMU_OPT_FLAGS" make %{?jobs:-j%{jobs}} @@ -304,6 +311,8 @@ %endif %changelog +* Mon Jul 30 2007 - uli(a)suse.de +- fixed for S/390 * Tue Jul 10 2007 - schwab(a)suse.de - Add (incomplete) m68k emulation. * Mon Jul 09 2007 - agraf(a)suse.de ++++++ qemu-s390.patch ++++++ ++++ 1965 lines (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 lomoco
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package lomoco checked in at Mon Jul 30 20:17:57 CEST 2007. -------- --- lomoco/lomoco.changes 2007-05-16 21:48:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/lomoco/lomoco.changes 2007-07-30 17:50:02.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jul 30 16:53:00 CEST 2007 - anschneider(a)suse.de + +- Update to version 1.0 + * Update udev rules and script for latest version; fixes (#295526) + * Added patch for the MX518, MX510, MX310, MX3100 + * Added lomoco.xml manpage template + * Updated udev support, thanks to Ludwig Nussel + * Fixed memory leaks +- Fix unitialized buffer +- Fix BuildRequires for later versions + +------------------------------------------------------------------- Old: ---- lomoco-1.0beta1.tar.gz New: ---- lomoco-1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lomoco.spec ++++++ --- /var/tmp/diff_new_pack.V11533/_old 2007-07-30 20:16:59.000000000 +0200 +++ /var/tmp/diff_new_pack.V11533/_new 2007-07-30 20:16:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package lomoco (Version 0.99_1.0beta1) +# spec file for package lomoco (Version 1.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,24 +12,27 @@ # icecream 0 Name: lomoco -BuildRequires: libusb-devel resmgr udev +BuildRequires: libusb resmgr udev +%if %suse_version > 1020 +BuildRequires: libusb-devel +%endif %if %suse_version > 1000 %define udev_scripts_dir /lib/udev %else %define udev_scripts_dir /etc/udev/scripts %endif -License: GNU General Public License (GPL) +License: GPL v2 or later URL: http://lomoco.linux-gamers.net/ Group: Hardware/Other -Version: 0.99_1.0beta1 -Release: 57 +Version: 1.0 +Release: 1 Summary: Tool for setting the special features of some Logitech mice BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: udev Conflicts: logitech_applet, lmctl Provides: lmctl:/usr/bin/lmctl Patch: lomoco.diff -Source: lomoco-1.0beta1.tar.gz +Source: lomoco-1.0.tar.gz Source2: tohal.awk Source3: sysconfig.logitech_mouse Source4: tomodalias.awk @@ -58,19 +61,17 @@ rm -rf %{buildroot} %setup -n lomoco-1.0 %if %suse_version > 1000 -%patch -p1 +%patch -p0 %endif %build -CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \ -./configure \ - --prefix=%{_prefix} \ - --infodir=%{_infodir} \ - --mandir=%{_mandir} -make +./autogen.sh +%configure + +%__make awk -f udev/toudev.awk < src/lomoco.c \ | sed 's,/etc/udev/scripts/lomoco,%{udev_scripts_dir}/lomoco.sh,' \ - > lomco.rules + > lomoco.rules awk -f %{SOURCE2} < src/lomoco.c > lomoco.fdi %install @@ -80,7 +81,7 @@ install -d -m 755 %{buildroot}/etc/udev/rules.d install -d -m 755 %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor install -d -m 755 %{buildroot}/var/adm/fillup-templates -install -m 644 lomco.rules %{buildroot}/etc/udev/rules.d/40-lomco.rules +install -m 644 lomoco.rules %{buildroot}/etc/udev/rules.d/40-lomoco.rules install -m 644 lomoco.fdi %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/50-lomoco.fdi install -d -m 755 %{buildroot}%{udev_scripts_dir} install -m 755 udev/udev.lomoco %{buildroot}%{udev_scripts_dir}/lomoco.sh @@ -104,6 +105,15 @@ /var/adm/fillup-templates/sysconfig.logitech_mouse %changelog +* Mon Jul 30 2007 - anschneider(a)suse.de +- Update to version 1.0 + * Update udev rules and script for latest version; fixes (#295526) + * Added patch for the MX518, MX510, MX310, MX3100 + * Added lomoco.xml manpage template + * Updated udev support, thanks to Ludwig Nussel + * Fixed memory leaks +- Fix unitialized buffer +- Fix BuildRequires for later versions * Wed May 16 2007 - olh(a)suse.de - Buildrequires libusb -> libusb-devel * Fri Mar 10 2006 - lnussel(a)suse.de ++++++ lomoco-1.0beta1.tar.gz -> lomoco-1.0.tar.gz ++++++ ++++ 24329 lines of diff (skipped) ++++++ lomoco.diff ++++++ --- /var/tmp/diff_new_pack.V11533/_old 2007-07-30 20:16:59.000000000 +0200 +++ /var/tmp/diff_new_pack.V11533/_new 2007-07-30 20:16:59.000000000 +0200 @@ -1,68 +1,20 @@ -Index: lomoco-1.0/udev/udev.lomoco +------------------------------------------------------------------------ +r79 | gladiac | 2006-03-19 15:12:32 +0100 (Sun, 19 Mar 2006) | 3 lines + +* fixed unitialized buffer + thanks to Nicolas CANIART + +------------------------------------------------------------------------ +Index: src/lomoco.c =================================================================== ---- lomoco-1.0.orig/udev/udev.lomoco -+++ lomoco-1.0/udev/udev.lomoco -@@ -1,10 +1,10 @@ --#!/lib/klibc/bin/sh -+#!/bin/bash - --case "$DEVICE" in -- /proc/bus/usb/*) -- dev=${DEVICE##/proc/bus/usb/} -- bus=${dev%/*} -- dev=${dev#*/} -+case "$DEVPATH" in -+ *usbdev*.*) -+ dev=${DEVPATH##*usbdev} -+ bus=`printf %03d ${dev%.*}` -+ dev=`printf %03d ${dev#*.}` - - . /etc/sysconfig/logitech_mouse - -Index: lomoco-1.0/udev/toudev.awk -=================================================================== ---- lomoco-1.0.orig/udev/toudev.awk -+++ lomoco-1.0/udev/toudev.awk -@@ -5,7 +5,7 @@ BEGIN { - - $1 ~ /0xc[a-f0-9][a-f0-9][a-f0-9]/ { - print "# " substr($3, index($3, "\"")) ", " $2 -- print "BUS==\"usb\", SUBSYSTEM==\"usb\", SYSFS{idVendor}==\"046d\", SYSFS{idProduct}==\"" \ -+ print "BUS==\"usb\", SUBSYSTEM==\"usb_device\", SYSFS{idVendor}==\"046d\", SYSFS{idProduct}==\"" \ - substr($1, index($1, "x")+1) \ - "\", RUN=\"/etc/udev/scripts/lomoco\"" - } -Index: lomoco-1.0/src/cmdline.c -=================================================================== ---- lomoco-1.0.orig/src/cmdline.c -+++ lomoco-1.0/src/cmdline.c -@@ -169,11 +169,11 @@ static error_t parse_opt (int key, char - switch (key) { - case 'b': - match_bus = strdup (arg); -- if ((sscanf (arg, "%03x", &dummy) != 1) || -+ if ((sscanf (arg, "%03d", &dummy) != 1) || - (strlen (arg) != 3) || -- (strspn (arg, "0123456789abcdefABCDEF") != 3)) { -+ (strspn (arg, "0123456789") != 3)) { - fprintf (stderr, -- "%s: the bus ID must be a three-digit hexadecimal\n" -+ "%s: the bus ID must be a three-digit decimal\n" - "number (e.g. 005). Use lsusb(1) to see the proper" - "format. you must specify the\nUse %s --help for" - "usage information.\n", -@@ -184,11 +184,11 @@ static error_t parse_opt (int key, char - - case 'd': - match_dev = strdup (arg); -- if ((sscanf (arg, "%03x", &dummy) != 1) || -+ if ((sscanf (arg, "%03d", &dummy) != 1) || - (strlen (arg) != 3) || -- (strspn (arg, "0123456789abcdefABCDEF") != 3)) { -+ (strspn (arg, "0123456789") != 3)) { - fprintf (stderr, -- "%s: the device ID must be a three-digit hexadecimal\n" -+ "%s: the device ID must be a three-digit decimal\n" - "number (e.g. 005). Use lsusb(1) to see the proper" - "format. you must specify the\nUse %s --help for" - "usage information.\n", +--- src/lomoco.c (revision 78) ++++ src/lomoco.c (revision 79) +@@ -667,7 +667,7 @@ + device->filename, + device->descriptor.idVendor, + device->descriptor.idProduct, +- ret ? product : "Unknown" ++ ret > 0 ? product : "Unknown" + ); + continue; + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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