October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit kchmviewer for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package kchmviewer for openSUSE:Factory checked in at 2014-10-05 20:32:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kchmviewer (Old) and /work/SRC/openSUSE:Factory/.kchmviewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kchmviewer" Changes: -------- --- /work/SRC/openSUSE:Factory/kchmviewer/kchmviewer.changes 2012-11-28 10:35:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kchmviewer.new/kchmviewer.changes 2014-10-05 20:33:44.000000000 +0200 @@ -1,0 +2,18 @@ +Sat Oct 4 16:17:43 UTC 2014 - mailaender(a)opensuse.org + +- Update to version 6.1 + - Keyboard usability improved thanks to the Giuseppe "Cowo" Corbelli. + - The focus is now moved to the content page once the link is clicked, so the keyboard navigation is available immediately. You can switch the focus back by pressing Ctrl+(1-4). + - Added extended keyboard shortcuts for FindNext and FindPrevious; F3 still works. + - Navigation tab window activation (Contents, Search, Index, Bookmarks) now automatically focus the proper element. + - The items in the navigation page now reacts on onItemActivated, and hence act on <Return> key and follow the DE policy (such as respecting KDE single click). + - Upon successful search, the focus moves to the results list. + - Titles are now space-trimmed. + - Fixed binary TOC parser check which led to crashes for some CHM files. + - Fixed incorrect settings file storage name when the CHM file contains multiple dots. + - Fixed the Ctrl+click and Shift+click when the release event was intercepted by other applications (i.e. GoldenDict) + - 'Esc' closes the search dialog and restores focus in the content window. +- Use http://en.opensuse.org/SourceUrls +- Add ftbfs.patch to fix the build. + +------------------------------------------------------------------- Old: ---- kchmviewer-6.0.tar.bz2 New: ---- ftbfs.patch kchmviewer-6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kchmviewer.spec ++++++ --- /var/tmp/diff_new_pack.MIzfdQ/_old 2014-10-05 20:33:46.000000000 +0200 +++ /var/tmp/diff_new_pack.MIzfdQ/_new 2014-10-05 20:33:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kchmviewer # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,51 +19,44 @@ Name: kchmviewer BuildRequires: chmlib-devel BuildRequires: libkde4-devel -Summary: KDE chm Viewer (MS Windows Compressed HTML Documents) +Summary: KDE CHM Viewer License: GPL-3.0 Group: Productivity/Office/Other -Version: 6.0 +Version: 6.1 Release: 0 Url: http://www.kchmviewer.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: %name-%version.tar.bz2 +Source: http://downloads.sourceforge.net/%name/%version/%name-%version.tar.gz +# PATCH-FIX-UPSTREAM https://sourceforge.net/p/kchmviewer/bugs/37/ +Patch1: https://raw.githubusercontent.com/ckorn/GetDeb/trusty/kchmviewer/patches/ft… %kde4_runtime_requires %description -This is a viewer for the chm files known from the MS Windows world. It -supports complex searching for large books and has various viewing -features. - - - -Authors: --------- - <tim(a)krasnogorsk.ru> +This is a viewer for the CHM files which are used for end user +documentation (MS Windows Compressed HTML Documents). It supports +complex searching for large books and has various viewing features. %prep %setup -q -n %{name}-%{version} +%patch1 -p1 %build %cmake_kde4 -d build %make_jobs %install - pushd build +pushd build make DESTDIR=%{buildroot} install - popd - %{__mkdir_p} %{buildroot}%{_datadir}/pixmaps - install src/resources/kchmviewer.png %{buildroot}%{_datadir}/pixmaps - %suse_update_desktop_file -G "Compressed HTML Viewer" %name Office Viewer - %kde_post_install - %find_lang %name - -%clean -rm -rf $RPM_BUILD_ROOT +popd +%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps +install src/resources/kchmviewer.png %{buildroot}%{_datadir}/pixmaps +%kde_post_install +%find_lang %name %files -f %name.lang %defattr(-,root,root) -/usr/bin/kchmviewer -/usr/share/applications/kde4/kchmviewer.desktop -/usr/share/pixmaps/kchmviewer.* +%{_bindir}/kchmviewer +%{_datadir}/applications/kde4/kchmviewer.desktop +%{_datadir}/pixmaps/kchmviewer.* %changelog ++++++ ftbfs.patch ++++++ # file does not exist and is not required # https://sourceforge.net/p/kchmviewer/bugs/37/ Index: kchmviewer-6.1/src/CMakeLists.txt =================================================================== --- kchmviewer-6.1.orig/src/CMakeLists.txt 2011-12-19 08:16:43.617437000 +0100 +++ kchmviewer-6.1/src/CMakeLists.txt 2014-04-12 00:51:43.311063988 +0200 @@ -8,7 +8,6 @@ dialog_chooseurlfromlist.cpp dialog_setup.cpp kde-qt.cpp - keyeventfilter.cpp main.cpp mainwindow.cpp navigationpanel.cpp -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-gmail-notifier for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package gnome-gmail-notifier for openSUSE:Factory checked in at 2014-10-05 20:32:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-gmail-notifier (Old) and /work/SRC/openSUSE:Factory/.gnome-gmail-notifier.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-gmail-notifier" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-gmail-notifier/gnome-gmail-notifier.changes 2013-03-08 09:09:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-gmail-notifier.new/gnome-gmail-notifier.changes 2014-10-05 20:33:42.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Oct 4 09:50:46 UTC 2014 - dimstar(a)opensuse.org + +- Add gnome-gmail-notifier-automake.patch: Fix build with + automake 1.14. + +------------------------------------------------------------------- New: ---- gnome-gmail-notifier-automake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-gmail-notifier.spec ++++++ --- /var/tmp/diff_new_pack.O27mh7/_old 2014-10-05 20:33:43.000000000 +0200 +++ /var/tmp/diff_new_pack.O27mh7/_new 2014-10-05 20:33:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-gmail-notifier # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,8 @@ Patch1: gnome-gmail-notifier-glib-2.31.patch # PATCH-FIX-UPSTREAM gnome-gmail-notifier-gstreamer-1.0.patch issue#99 dimstar(a)opensuse.org -- Port to GStreamer 1.0 Patch2: gnome-gmail-notifier-gstreamer-1.0.patch +# PATCH-FIX-UPSTREAM gnome-gmail-notifier-automake.patch issue#104 dimstar(a)opensuse.org -- Fix build with automake >= 1.14 +Patch3: gnome-gmail-notifier-automake.patch BuildRequires: fdupes # Needed for patch2 BuildRequires: gnome-common @@ -59,9 +61,10 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build -# Needed for patch2 +# Needed for patch2 and patch3 NOCONFIGURE=1 ./autogen.sh %configure %__make %{?_smp_mflags} ++++++ gnome-gmail-notifier-automake.patch ++++++ Index: gnome-gmail-notifier-0.10.1/configure.ac =================================================================== --- gnome-gmail-notifier-0.10.1.orig/configure.ac +++ gnome-gmail-notifier-0.10.1/configure.ac @@ -3,6 +3,7 @@ AC_PREREQ(2.52) AC_INIT(gnome-gmail-notifier, 0.10.1, geekysuavo(a)gmail.com) AC_CONFIG_SRCDIR(src/main.c) AM_CONFIG_HEADER(src/config.h) +AM_INIT_AUTOMAKE AC_PROG_CC AC_PROG_INSTALL @@ -14,7 +15,6 @@ GGN_LOCALEDIR="${datadir}/locale" AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GGN_LOCALEDIR) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) ALL_LINGUAS="es" AM_GLIB_GNU_GETTEXT Index: gnome-gmail-notifier-0.10.1/autogen.sh =================================================================== --- gnome-gmail-notifier-0.10.1.orig/autogen.sh +++ gnome-gmail-notifier-0.10.1/autogen.sh @@ -61,16 +61,3 @@ automake --add-missing echo " autoconf" autoconf -if [ -x config.status -a -z "$*" ]; then - ./config.status --recheck -else - if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish" - echo "to pass any to it, please specify them on the $0 command line." - echo "If you do not wish to run ./configure, press Ctrl-C now." - trap 'echo "configure aborted" ; exit 0' 1 2 15 - sleep 1 - fi - echo " ./configure ${@}" - ./configure "$@"; -fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-json_pure-1_5 for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package rubygem-json_pure-1_5 for openSUSE:Factory checked in at 2014-10-05 20:32:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-json_pure-1_5 (Old) and /work/SRC/openSUSE:Factory/.rubygem-json_pure-1_5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-json_pure-1_5" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-json_pure-1_5/rubygem-json_pure-1_5.changes 2013-07-01 15:59:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-json_pure-1_5.new/rubygem-json_pure-1_5.changes 2014-10-05 20:33:41.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 30 12:02:45 UTC 2014 - mrueckert(a)suse.de + +- update to new packaging scheme and add gem2rpm.yml + +------------------------------------------------------------------- New: ---- gem2rpm.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-json_pure-1_5.spec ++++++ --- /var/tmp/diff_new_pack.WyWikR/_old 2014-10-05 20:33:42.000000000 +0200 +++ /var/tmp/diff_new_pack.WyWikR/_new 2014-10-05 20:33:42.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package rubygem-json_pure +# spec file for package rubygem-json_pure-1_5 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,86 +14,46 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# +# This file was generated with a gem2rpm.yml and not just plain gem2rpm. +# All sections marked as MANUAL, license headers, summaries and descriptions +# can be maintained in that file. Please consult this file before editing any +# of those fields +# -# norootforbuild Name: rubygem-json_pure-1_5 Version: 1.5.4 Release: 0 %define mod_name json_pure %define mod_full_name %{mod_name}-%{version} -# -Group: Development/Languages/Ruby -License: GPL-2.0+ -# +%define mod_version_suffix -1_5 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: rubygems_with_buildroot_patch +BuildRequires: ruby-macros >= 5 +BuildRequires: %{ruby} +BuildRequires: %{rubygem gem2rpm} +BuildRequires: %{rubygem rdoc > 3.10} BuildRequires: update-alternatives -# spruz ~> 0.2.8 -BuildRequires: rubygem-spruz-0_2 >= 0.2.8 -Requires: rubygem-spruz-0_2 >= 0.2.8 -%if %suse_version > 1120 -Requires(post): update-alternatives -Requires(preun): update-alternatives -%else -PreReq: update-alternatives -%endif -Provides: rubygem-%{mod_name}-1_5 = %{version} -%rubygems_requires -# Url: http://flori.github.com/json -Source: %{mod_full_name}.gem -# +Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source1: gem2rpm.yml Summary: JSON Implementation for Ruby +License: GPL-2.0+ +Group: Development/Languages/Ruby +PreReq: update-alternatives + %description This is a JSON implementation in pure Ruby. -%package doc -Summary: RDoc documentation for %{mod_name} -Group: Development/Languages/Ruby -Requires: %{name} = %{version} -%description doc -Documentation generated at gem installation time. -Usually in RDoc and RI formats. - %prep + %build + %install -%gem_install %{S:0} +%gem_install \ + --symlink-binaries \ + --doc-files="COPYING README.rdoc CHANGES" \ + -f -for i in edit_json prettify_json -do - rm -f %{buildroot}%{_bindir}/$i.rb -done - -rm -rf %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/java - -%post -for i in edit_json prettify_json -do - test -L %{_bindir}/$i.rb || rm -f %{_bindir}/$i.rb - update-alternatives --install %{_bindir}/$i.rb $i.rb %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/bin/$i.rb 5 - update-alternatives --auto $i.rb -done - -%preun -for i in edit_json prettify_json -do - if [ $1 -eq 0 ]; then - update-alternatives --remove $i.rb %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/bin/$i.rb - fi -done - -%clean -%{__rm} -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ -%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec - -%files doc -%defattr(-,root,root,-) -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/ +%gem_packages %changelog ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm # :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # --- :version_suffix: '-1_5' -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-json_pure for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package rubygem-json_pure for openSUSE:Factory checked in at 2014-10-05 20:32:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-json_pure (Old) and /work/SRC/openSUSE:Factory/.rubygem-json_pure.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-json_pure" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-json_pure/rubygem-json_pure.changes 2013-10-31 15:56:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-json_pure.new/rubygem-json_pure.changes 2014-10-05 20:33:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 30 12:02:43 UTC 2014 - mrueckert(a)suse.de + +- update to new packaging scheme and add gem2rpm.yml + +------------------------------------------------------------------- New: ---- gem2rpm.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-json_pure.spec ++++++ --- /var/tmp/diff_new_pack.GbnN6z/_old 2014-10-05 20:33:41.000000000 +0200 +++ /var/tmp/diff_new_pack.GbnN6z/_new 2014-10-05 20:33:41.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-json_pure # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,19 +14,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +# +# This file was generated with a gem2rpm.yml and not just plain gem2rpm. +# All sections marked as MANUAL, license headers, summaries and descriptions +# can be maintained in that file. Please consult this file before editing any +# of those fields +# Name: rubygem-json_pure Version: 1.8.1 Release: 0 %define mod_name json_pure %define mod_full_name %{mod_name}-%{version} - BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ruby-macros >= 1 -BuildRequires: rubygem(rdoc) > 3.10 +BuildRequires: ruby-macros >= 5 +BuildRequires: %{ruby} +BuildRequires: %{rubygem gem2rpm} +BuildRequires: %{rubygem rdoc > 3.10} Url: http://flori.github.com/json Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source1: gem2rpm.yml Summary: JSON Implementation for Ruby License: Ruby Group: Development/Languages/Ruby @@ -34,38 +41,15 @@ %description This is a JSON implementation in pure Ruby. -%package doc -Summary: RDoc documentation for %{mod_name} -Group: Development/Languages/Ruby -Requires: %{name} = %{version} - -%description doc -Documentation generated at gem installation time. -Usually in RDoc and RI formats. - %prep -#gem_unpack -#if you need patches, apply them here and replace the # with a % sign in the surrounding lines -#gem_build %build %install -%gem_install -f -mkdir -p %{buildroot}%{_docdir}/%{name} -ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/CHANGES %buildroot/%{_docdir}/%{name}/CHANGES -ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/COPYING %buildroot/%{_docdir}/%{name}/COPYING -ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/README.rdoc %buildroot/%{_docdir}/%{name}/README.rdoc - -%files -%defattr(-,root,root,-) -%{_docdir}/%{name} -%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ -%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec - -%files doc -%defattr(-,root,root,-) -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/ +%gem_install \ + --doc-files="CHANGES COPYING README.rdoc" \ + -f + +%gem_packages %changelog ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm # :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # --- :license: Ruby -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sshfs for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package sshfs for openSUSE:Factory checked in at 2014-10-05 20:32:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sshfs (Old) and /work/SRC/openSUSE:Factory/.sshfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sshfs" Changes: -------- --- /work/SRC/openSUSE:Factory/sshfs/sshfs.changes 2012-06-05 15:35:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sshfs.new/sshfs.changes 2014-10-05 20:33:39.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Oct 4 00:07:41 CEST 2014 - dsterba(a)suse.cz + +- update to 2.5 + * Add -o disable_hardlink option (debian bug #670926). + * Optimize readdir by sending multiple requests in parallel. Add -o + sync_readdir to restore old behavior. + * Map SSH2_FX_FAILURE to ENOTEMPTY for rmdir. + * When checking root directory use LSTAT not STAT. This prevents I/O error + being returned after a successful mount if a symlink is mounted. + +------------------------------------------------------------------- Old: ---- sshfs-fuse-2.4.tar.gz New: ---- sshfs-fuse-2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sshfs.spec ++++++ --- /var/tmp/diff_new_pack.OkzHi8/_old 2014-10-05 20:33:40.000000000 +0200 +++ /var/tmp/diff_new_pack.OkzHi8/_new 2014-10-05 20:33:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sshfs # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Summary: Filesystem client based on SSH file transfer protocol License: GPL-2.0+ Group: System/Filesystems -Version: 2.4 +Version: 2.5 Release: 0 Source: %{name}-fuse-%{version}.tar.gz Url: http://fuse.sourceforge.net/sshfs.html ++++++ sshfs-fuse-2.4.tar.gz -> sshfs-fuse-2.5.tar.gz ++++++ ++++ 3504 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/sshfs-fuse-2.4/ChangeLog new/sshfs-fuse-2.5/ChangeLog --- old/sshfs-fuse-2.4/ChangeLog 2012-03-08 10:35:31.000000000 +0100 +++ new/sshfs-fuse-2.5/ChangeLog 2014-01-14 15:07:26.000000000 +0100 @@ -1,3 +1,27 @@ +2014-01-14 Miklos Szeredi <miklos(a)szeredi.hu> + + * Released 2.5 + +2014-01-08 Miklos Szeredi <miklos(a)szeredi.hu> + + * Add -o disable_hardlink option (debian bug #670926). Reported + by Louis-David Mitterrand + + * Optimize readdir by sending multiple requests in parallel. Add + -o sync_readdir to restore old behavior. Patch by Alexander + Neumann + +2014-01-07 Miklos Szeredi <miklos(a)szeredi.hu> + + * Map SSH2_FX_FAILURE to ENOTEMPTY for rmdir. Reported by Ross + Lagerwall + +2012-05-14 Miklos Szeredi <miklos(a)szeredi.hu> + + * When checking root directory use LSTAT not STAT. This prevents + I/O error being returned after a successful mount if a symlink is + mounted. Reported by Bart Friederichs + 2012-03-08 Miklos Szeredi <miklos(a)szeredi.hu> * Released 2.4 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/sshfs-fuse-2.4/FAQ.txt new/sshfs-fuse-2.5/FAQ.txt --- old/sshfs-fuse-2.4/FAQ.txt 2012-03-08 10:30:08.000000000 +0100 +++ new/sshfs-fuse-2.5/FAQ.txt 2014-01-14 15:22:30.000000000 +0100 @@ -1,5 +1,8 @@ -See http://fuse.sourceforge.net/wiki/index.php/SshfsFaq for the latest -version of this FAQ +See + + http://sourceforge.net/apps/mediawiki/fuse/index.php?title=SshfsFaq + +for the latest version of this FAQ --- 1. I've found a bug and there's no solution in this FAQ, what 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/sshfs-fuse-2.4/INSTALL new/sshfs-fuse-2.5/INSTALL --- old/sshfs-fuse-2.4/INSTALL 2011-11-14 14:34:05.000000000 +0100 +++ new/sshfs-fuse-2.5/INSTALL 2013-02-05 12:32:09.000000000 +0100 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -304,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -362,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - 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/sshfs-fuse-2.4/compile new/sshfs-fuse-2.5/compile --- old/sshfs-fuse-2.4/compile 2011-11-14 14:34:05.000000000 +0100 +++ new/sshfs-fuse-2.5/compile 2013-02-05 12:32:09.000000000 +0100 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-03-05.13; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,219 @@ # bugs to <bug-automake(a)gnu.org> or send patches to # <automake-patches(a)gnu.org>. +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + 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'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + 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 +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'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to <bug-automake(a)gnu.org>. EOF @@ -53,11 +250,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +265,8 @@ 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. + # 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) @@ -94,10 +293,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # 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 + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +305,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# 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 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/sshfs-fuse-2.4/configure.ac new/sshfs-fuse-2.5/configure.ac --- old/sshfs-fuse-2.4/configure.ac 2012-03-08 10:29:03.000000000 +0100 +++ new/sshfs-fuse-2.5/configure.ac 2014-01-14 15:07:46.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(sshfs-fuse, 2.4) +AC_INIT(sshfs-fuse, 2.5) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.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/sshfs-fuse-2.4/missing new/sshfs-fuse-2.5/missing --- old/sshfs-fuse-2.4/missing 2011-11-14 14:34:05.000000000 +0100 +++ new/sshfs-fuse-2.5/missing 2013-02-05 12:32:09.000000000 +0100 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 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 @@ -26,7 +25,7 @@ # 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" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' sed_minuso='s/.* -o $[^ ]*$.*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --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' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + 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 + 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] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # 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 + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program 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 +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 +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 +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" @@ -186,9 +175,9 @@ 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. +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/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +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 + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ 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 +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." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ 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 +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." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +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." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ 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 +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." + 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 "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ 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. +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, + 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." + some other package would contain this missing '$1' program." exit 1 ;; esac 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/sshfs-fuse-2.4/sshfs.1 new/sshfs-fuse-2.5/sshfs.1 --- old/sshfs-fuse-2.4/sshfs.1 2012-02-14 12:55:14.000000000 +0100 +++ new/sshfs-fuse-2.5/sshfs.1 2014-01-08 16:34:52.000000000 +0100 @@ -58,6 +58,9 @@ \fB\-o\fR no_readahead synchronous reads (no speculative readahead) .TP +\fB\-o\fR sync_readdir +synchronous readdir +.TP \fB\-o\fR sshfs_debug print some debugging information .TP @@ -138,9 +141,15 @@ .TP \fB\-o\fR directport=PORT directly connect to PORT bypassing ssh +.TP \fB\-o\fR slave communicate over stdin and stdout bypassing network .TP +\fB\-o\fR disable_hardlink +link(2) will return with errno set to ENOSYS. Hard links don't currently work +perfectly on sshfs, and this confuses some programs. If that happens try +disabling hard links with this option. +.TP \fB\-o\fR transform_symlinks transform absolute symlinks to relative .TP @@ -256,7 +265,7 @@ \fB\-o\fR subdir=DIR prepend this directory to all paths (mandatory) .TP -\fB\-o\fR [no]rellinksa +\fB\-o\fR [no]rellinks transform absolute symlinks to relative .TP [iconv] 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/sshfs-fuse-2.4/sshfs.c new/sshfs-fuse-2.5/sshfs.c --- old/sshfs-fuse-2.4/sshfs.c 2012-03-08 10:34:39.000000000 +0100 +++ new/sshfs-fuse-2.5/sshfs.c 2014-01-08 16:34:52.000000000 +0100 @@ -121,6 +121,10 @@ #define SSHNODELAY_SO "sshnodelay.so" +/* Asynchronous readdir parameters */ +#define READDIR_START 2 +#define READDIR_MAX 32 + struct buffer { uint8_t *p; size_t len; @@ -139,6 +143,7 @@ unsigned int want_reply; sem_t ready; uint8_t reply_type; + uint32_t id; int replied; int error; struct buffer reply; @@ -203,6 +208,7 @@ int detect_uid; int idmap; int nomap; + int disable_hardlink; char *uid_file; char *gid_file; GHashTable *uid_map; @@ -214,6 +220,7 @@ unsigned ssh_ver; int sync_write; int sync_read; + int sync_readdir; int debug; int foreground; int reconnect; @@ -350,6 +357,7 @@ SSHFS_OPT("nomap=error", nomap, NOMAP_ERROR), SSHFS_OPT("sshfs_sync", sync_write, 1), SSHFS_OPT("no_readahead", sync_read, 1), + SSHFS_OPT("sync_readdir", sync_readdir, 1), SSHFS_OPT("sshfs_debug", debug, 1), SSHFS_OPT("reconnect", reconnect, 1), SSHFS_OPT("transform_symlinks", transform_symlinks, 1), @@ -358,6 +366,7 @@ SSHFS_OPT("password_stdin", password_stdin, 1), SSHFS_OPT("delay_connect", delay_connect, 1), SSHFS_OPT("slave", slave, 1), + SSHFS_OPT("disable_hardlink", disable_hardlink, 1), FUSE_OPT_KEY("-p ", KEY_PORT), FUSE_OPT_KEY("-C", KEY_COMPRESS), @@ -1620,7 +1629,7 @@ buf_init(&buf, 0); buf_add_string(&buf, remote_dir); buf_to_iov(&buf, &iov[0]); - if (sftp_send_iov(SSH_FXP_STAT, id, iov, 1) == -1) + if (sftp_send_iov(SSH_FXP_LSTAT, id, iov, 1) == -1) goto out; buf_clear(&buf); if (sftp_read(&type, &buf) == -1) @@ -1790,6 +1799,13 @@ err = -EIO; break; + case SSH_FX_FAILURE: + if (type == SSH_FXP_RMDIR) + err = -ENOTEMPTY; + else + err = -EPERM; + break; + default: err = -sftp_error_to_errno(serr); } @@ -1827,6 +1843,7 @@ if (begin_func) begin_func(req); id = sftp_get_id(); + req->id = id; err = start_processing_thread(); if (err) { pthread_mutex_unlock(&sshfs.lock); @@ -2014,6 +2031,113 @@ return err; } +static int sftp_readdir_send(struct request **req, struct buffer *handle) +{ + struct iovec iov; + + buf_to_iov(handle, &iov); + return sftp_request_send(SSH_FXP_READDIR, &iov, 1, NULL, NULL, + SSH_FXP_NAME, NULL, req); +} + +static int sshfs_req_pending(struct request *req) +{ + if (g_hash_table_lookup(sshfs.reqtab, GUINT_TO_POINTER(req->id))) + return 1; + else + return 0; +} + +static int sftp_readdir_async(struct buffer *handle, fuse_cache_dirh_t h, + fuse_cache_dirfil_t filler) +{ + int err = 0; + int outstanding = 0; + int max = READDIR_START; + GList *list = NULL; + + int done = 0; + + while (!done || outstanding) { + struct request *req; + struct buffer name; + int tmperr; + + while (!done && outstanding < max) { + tmperr = sftp_readdir_send(&req, handle); + + if (tmperr && !done) { + err = tmperr; + done = 1; + break; + } + + list = g_list_append(list, req); + outstanding++; + } + + if (outstanding) { + GList *first; + /* wait for response to next request */ + first = g_list_first(list); + req = first->data; + list = g_list_delete_link(list, first); + outstanding--; + + if (done) { + pthread_mutex_lock(&sshfs.lock); + if (sshfs_req_pending(req)) + req->want_reply = 0; + pthread_mutex_unlock(&sshfs.lock); + if (!req->want_reply) + continue; + } + + tmperr = sftp_request_wait(req, SSH_FXP_READDIR, + SSH_FXP_NAME, &name); + + if (tmperr && !done) { + err = tmperr; + if (err == MY_EOF) + err = 0; + done = 1; + } + if (!done) { + err = buf_get_entries(&name, h, filler); + buf_free(&name); + + /* increase number of outstanding requests */ + if (max < READDIR_MAX) + max++; + + if (err) + done = 1; + } + } + } + assert(list == NULL); + + return err; +} + +static int sftp_readdir_sync(struct buffer *handle, fuse_cache_dirh_t h, + fuse_cache_dirfil_t filler) +{ + int err; + do { + struct buffer name; + err = sftp_request(SSH_FXP_READDIR, handle, SSH_FXP_NAME, &name); + if (!err) { + err = buf_get_entries(&name, h, filler); + buf_free(&name); + } + } while (!err); + if (err == MY_EOF) + err = 0; + + return err; +} + static int sshfs_getdir(const char *path, fuse_cache_dirh_t h, fuse_cache_dirfil_t filler) { @@ -2026,16 +2150,11 @@ if (!err) { int err2; buf_finish(&handle); - do { - struct buffer name; - err = sftp_request(SSH_FXP_READDIR, &handle, SSH_FXP_NAME, &name); - if (!err) { - err = buf_get_entries(&name, h, filler); - buf_free(&name); - } - } while (!err); - if (err == MY_EOF) - err = 0; + + if (sshfs.sync_readdir) + err = sftp_readdir_sync(&handle, h, filler); + else + err = sftp_readdir_async(&handle, h, filler); err2 = sftp_request(SSH_FXP_CLOSE, &handle, 0, NULL); if (!err) @@ -2192,7 +2311,7 @@ { int err = -ENOSYS; - if (sshfs.ext_hardlink) { + if (sshfs.ext_hardlink && !sshfs.disable_hardlink) { struct buffer buf; buf_init(&buf, 0); @@ -3162,6 +3281,7 @@ " -o delay_connect delay connection to server\n" " -o sshfs_sync synchronous writes\n" " -o no_readahead synchronous reads (no speculative readahead)\n" +" -o sync_readdir synchronous readdir\n" " -o sshfs_debug print some debugging information\n" " -o cache=BOOL enable caching {yes,no} (default: yes)\n" " -o cache_timeout=N sets timeout for caches in seconds (default: 20)\n" @@ -3190,6 +3310,7 @@ " -o sftp_server=SERV path to sftp server or subsystem (default: sftp)\n" " -o directport=PORT directly connect to PORT bypassing ssh\n" " -o slave communicate over stdin and stdout bypassing network\n" +" -o disable_hardlink link(2) will return with errno set to ENOSYS\n" " -o transform_symlinks transform absolute symlinks to relative\n" " -o follow_symlinks follow symlinks on the server\n" " -o no_check_root don't check for existence of 'dir' on server\n" @@ -3863,6 +3984,10 @@ exit(1); } + /* + * FIXME: trim $PATH so it doesn't contain anything inside the + * mountpoint, which would deadlock. + */ res = ssh_connect(); if (res == -1) { fuse_unmount(mountpoint, ch); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2014-10-05 20:31:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2014-09-28 19:54:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2014-10-05 20:33:37.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Oct 3 21:18:44 UTC 2014 - meissner(a)suse.com + +- Updated to 1.7.28 development snapshot + - Support for conditional compilation in JavaScript. + - Bidirectional text support in DirectWrite. + - Stubs for DirectPlay Voice support. + - Various bug fixes. + +------------------------------------------------------------------- Old: ---- wine-1.7.27.tar.bz2 wine-1.7.27.tar.bz2.sign New: ---- wine-1.7.28.tar.bz2 wine-1.7.28.tar.bz2.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.kaGBc1/_old 2014-10-05 20:33:39.000000000 +0200 +++ /var/tmp/diff_new_pack.kaGBc1/_new 2014-10-05 20:33:39.000000000 +0200 @@ -56,7 +56,7 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.27 +Version: 1.7.28 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ ++++++ wine-1.7.27.tar.bz2 -> wine-1.7.28.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.7.27.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.7.28.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit blktrace for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package blktrace for openSUSE:Factory checked in at 2014-10-05 20:31:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blktrace (Old) and /work/SRC/openSUSE:Factory/.blktrace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blktrace" Changes: -------- --- /work/SRC/openSUSE:Factory/blktrace/blktrace.changes 2013-01-07 15:38:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.blktrace.new/blktrace.changes 2014-10-05 20:33:35.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 3 23:44:40 CEST 2014 - dsterba(a)suse.cz + +- Update to 1.1.0: + - merge iowatcher + +------------------------------------------------------------------- Old: ---- blktrace-1.0.5.tar.bz2 New: ---- blktrace-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blktrace.spec ++++++ --- /var/tmp/diff_new_pack.VsjUeY/_old 2014-10-05 20:33:36.000000000 +0200 +++ /var/tmp/diff_new_pack.VsjUeY/_new 2014-10-05 20:33:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package blktrace # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,11 +22,12 @@ Summary: Block IO tracer License: GPL-2.0 Group: Development/Tools/Other -Version: 1.0.5 +Version: 1.1.0 Release: 0 Url: http://git.kernel.dk/?p=blktrace.git;a=summary -Source0: %name-%version.tar.bz2 +Source0: http://brick.kernel.dk/snaps/%name-%version.tar.bz2 Patch0: blkparse-track-smallest-sequence-read-per-device.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc BuildRequires: libaio-devel %if 0%{?with_docs} @@ -80,6 +81,7 @@ %{_bindir}/btreplay %{_bindir}/verify_blkparse %{_bindir}/blkiomon +%{_bindir}/iowatcher %{_mandir}/man1/blkparse.1* %{_mandir}/man1/blkrawverify.1* %{_mandir}/man1/bno_plot.1* ++++++ blktrace-1.0.5.tar.bz2 -> blktrace-1.1.0.tar.bz2 ++++++ ++++ 6839 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mksh for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package mksh for openSUSE:Factory checked in at 2014-10-05 20:31:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksh (Old) and /work/SRC/openSUSE:Factory/.mksh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mksh" Changes: -------- --- /work/SRC/openSUSE:Factory/mksh/mksh.changes 2014-09-06 16:59:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mksh.new/mksh.changes 2014-10-05 20:33:34.000000000 +0200 @@ -1,0 +2,19 @@ +Fri Oct 3 19:21:55 UTC 2014 - tg(a)mirbsd.org + +- update to SECURITY version 50c + - [tg] Know more rare signals when generating sys_signame[] replacement + - [tg] OpenBSD sync (mostly RCSID only) + - [tg] Document HISTSIZE limit; found by luigi_345 on IRC + - [zacts] Fix link to Debian .mkshrc + - [tg] Cease exporting $RANDOM (Debian #760857) + - [tg] Fix C99 compatibility + - [tg] Work around klibc bug causing a coredump (Debian #763842) + - [tg] Use issetugid(2) as additional check if we are FPRIVILEGED + - [tg] SECURITY: do not permit += from environment + - [tg] Fix more field splitting bugs reported by Stephane Chazelas and + mikeserv; document current status wrt. ambiguous ones as testcases too +- use build log cleaner sed command from home:mirabile package +- enable lksh build-time option to automatically run "set -o posix" + when called as sh or -sh, like home:mirabile package did + +------------------------------------------------------------------- Old: ---- mksh-R50b.tgz New: ---- mksh-R50c.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksh.spec ++++++ --- /var/tmp/diff_new_pack.RdEVqt/_old 2014-10-05 20:33:35.000000000 +0200 +++ /var/tmp/diff_new_pack.RdEVqt/_new 2014-10-05 20:33:35.000000000 +0200 @@ -3,7 +3,7 @@ # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 Guido Berhoerster. -# Copyright (c) 2013 Thorsten Glaser. +# Copyright (c) 2013, 2014 Thorsten Glaser. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ # Please see OBS home:mirabile/mksh for a package for other distributions. Name: mksh -Version: 50b +Version: 50c Release: 0 Summary: MirBSD Korn Shell License: MirOS and ISC @@ -82,6 +82,8 @@ sh Build.sh -r -c lto || touch build.failed %endif mv test.sh test-mksh.sh +# build lksh to automatically enable -o posix if called as sh + CPPFLAGS="$CPPFLAGS -DMKSH_BINSHPOSIX" # work around bugs in gcc 4.8 (deb#717734 rh#922974) and gcc 4.1.2 in SLE 10 %if 0%{?suse_version} >= 1310 || 0%{?sles_version} == 10 sh Build.sh -L -r || touch build.failed @@ -89,7 +91,9 @@ sh Build.sh -L -r -c lto || touch build.failed %endif mv test.sh test-lksh.sh -} 2>&1 | sed '/conftest.c:/s/: warning:/: W:/' +} 2>&1 | sed \ + -e 's!conftest.c:$[0-9]*\(:[0-9]*$*\): error:!cE(\1) -!g' \ + -e 's!conftest.c:$[0-9]*\(:[0-9]*$*\): warning:!cW(\1) -!g' test ! -e build.failed %install ++++++ mksh-R50b.tgz -> mksh-R50c.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/Build.sh new/mksh/Build.sh --- old/mksh/Build.sh 2014-09-03 21:23:13.000000000 +0200 +++ new/mksh/Build.sh 2014-10-03 19:32:57.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.664 2014/09/03 19:22:48 tg Exp $' +srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.668 2014/10/03 17:32:07 tg Exp $' #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012, 2013, 2014 @@ -1784,7 +1784,7 @@ #define EXTERN #define MKSH_INCLUDES_ONLY #include "sh.h" - __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.664 2014/09/03 19:22:48 tg Exp $"); + __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.668 2014/10/03 17:32:07 tg Exp $"); int main(void) { printf("Hello, World!\n"); return (isatty(0)); } EOF case $cm in @@ -1904,6 +1904,11 @@ int main(void) { struct timeval tv; return (gettimeofday(&tv, NULL)); } EOF +ac_test issetugid <<-'EOF' + #include <unistd.h> + int main(void) { return (issetugid()); } +EOF + ac_test killpg <<-'EOF' #include <signal.h> int main(int ac, char *av[]) { return (av[0][killpg(123, ac)]); } @@ -2273,6 +2278,7 @@ sigs="ABRT FPE ILL INT SEGV TERM ALRM BUS CHLD CONT HUP KILL PIPE QUIT" sigs="$sigs STOP TSTP TTIN TTOU USR1 USR2 POLL PROF SYS TRAP URG VTALRM" sigs="$sigs XCPU XFSZ INFO WINCH EMT IO DIL LOST PWR SAK CLD IOT RESV" + sigs="$sigs STKFLT UNUSED" test 1 = $HAVE_CPP_DD && test $NSIG -gt 1 && sigs="$sigs "`vq \ "$CPP $CFLAGS $CPPFLAGS $NOWARN -dD conftest.c" | \ grep '[ ]SIG[A-Z0-9][A-Z0-9]*[ ]' | \ @@ -2310,7 +2316,7 @@ addsrcs USE_PRINTF_BUILTIN printf.c test 1 = "$USE_PRINTF_BUILTIN" && add_cppflags -DMKSH_PRINTF_BUILTIN test 1 = "$HAVE_CAN_VERB" && CFLAGS="$CFLAGS -verbose" -add_cppflags -DMKSH_BUILD_R=502 +add_cppflags -DMKSH_BUILD_R=503 $e $bi$me: Finished configuration testing, now producing output.$ao @@ -2647,7 +2653,7 @@ Copy dot.mkshrc to /etc/skel/.mkshrc; install mksh into $prefix/bin; or /bin; install the manpage, if omitting the -r flag a catmanpage is made using $NROFF. Consider using a forward script as /etc/skel/.mkshrc like -https://www.mirbsd.org/cvs.cgi/contrib/hosted/tg/deb/mksh/debian/.mkshrc?rev=HEAD +http://anonscm.debian.org/cgit/collab-maint/mksh.git/plain/debian/.mkshrc and put dot.mkshrc as /etc/mkshrc so users need not keep up their HOME. EOD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/check.t new/mksh/check.t --- old/mksh/check.t 2014-09-03 21:23:14.000000000 +0200 +++ new/mksh/check.t 2014-10-03 19:32:59.000000000 +0200 @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/check.t,v 1.658 2014/09/03 19:22:49 tg Exp $ +# $MirOS: src/bin/mksh/check.t,v 1.659 2014/10/03 17:32:09 tg Exp $ # OpenBSD src/regress/bin/ksh updated: 2013/12/02 20:39:44 #- # Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, @@ -27,7 +27,7 @@ # http://www.freebsd.org/cgi/cvsweb.cgi/src/tools/regression/bin/test/regress… expected-stdout: - @(#)MIRBSD KSH R50 2014/09/03 + @(#)MIRBSD KSH R50 2014/10/03 description: Check version of shell. stdin: @@ -36,7 +36,7 @@ category: shell:legacy-no --- expected-stdout: - @(#)LEGACY KSH R50 2014/09/03 + @(#)LEGACY KSH R50 2014/10/03 description: Check version of legacy shell. stdin: @@ -3736,7 +3736,6 @@ name: IFS-subst-3 description: Check leading IFS non-whitespace after trim does make a field -expected-fail: yes stdin: showargs() { for i; do echo -n " <$i>"; done; echo; } IFS=: @@ -3744,6 +3743,390 @@ expected-stdout: <1> <> <foo> <bar> --- +name: IFS-subst-4-1 +description: + reported by mikeserv +stdin: + a='space divded argument + here' + IFS=\ ; set -- $a + IFS= ; q="$*" ; nq=$* + printf '<%s>\n' "$*" $* "$q" "$nq" + [ "$q" = "$nq" ] && echo =true || echo =false +expected-stdout: + <spacedivdedargument + here> + <space> + <divded> + <argument + here> + <spacedivdedargument + here> + <spacedivdedargument + here> + =true +--- +name: IFS-subst-4-2 +description: + extended testsuite based on problem by mikeserv +stdin: + a='space divded argument + here' + IFS=\ ; set -- $a + IFS= ; q="$@" ; nq=$@ + printf '<%s>\n' "$*" $* "$q" "$nq" + [ "$q" = "$nq" ] && echo =true || echo =false +expected-stdout: + <spacedivdedargument + here> + <space> + <divded> + <argument + here> + <space divded argument + here> + <space divded argument + here> + =true +--- +name: IFS-subst-4-3 +description: + extended testsuite based on problem by mikeserv +stdin: + a='space divded argument + here' + IFS=\ ; set -- $a; IFS= + qs="$*" + nqs=$* + qk="$@" + nqk=$@ + printf '= qs '; printf '<%s>\n' "$qs" + printf '=nqs '; printf '<%s>\n' "$nqs" + printf '= qk '; printf '<%s>\n' "$qk" + printf '=nqk '; printf '<%s>\n' "$nqk" + printf '~ qs '; printf '<%s>\n' "$*" + printf '~nqs '; printf '<%s>\n' $* + printf '~ qk '; printf '<%s>\n' "$@" + printf '~nqk '; printf '<%s>\n' $@ +expected-stdout: + = qs <spacedivdedargument + here> + =nqs <spacedivdedargument + here> + = qk <space divded argument + here> + =nqk <space divded argument + here> + ~ qs <spacedivdedargument + here> + ~nqs <space> + <divded> + <argument + here> + ~ qk <space> + <divded> + <argument + here> + ~nqk <space> + <divded> + <argument + here> +--- +name: IFS-subst-4-4 +description: + extended testsuite based on problem by mikeserv +stdin: + a='space divded argument + here' + IFS=\ ; set -- $a; IFS= + qs="$*" + printf '= qs '; printf '<%s>\n' "$qs" + printf '~ qs '; printf '<%s>\n' "$*" + nqs=$* + printf '=nqs '; printf '<%s>\n' "$nqs" + printf '~nqs '; printf '<%s>\n' $* + qk="$@" + printf '= qk '; printf '<%s>\n' "$qk" + printf '~ qk '; printf '<%s>\n' "$@" + nqk=$@ + printf '=nqk '; printf '<%s>\n' "$nqk" + printf '~nqk '; printf '<%s>\n' $@ +expected-stdout: + = qs <spacedivdedargument + here> + ~ qs <spacedivdedargument + here> + =nqs <spacedivdedargument + here> + ~nqs <space> + <divded> + <argument + here> + = qk <space divded argument + here> + ~ qk <space> + <divded> + <argument + here> + =nqk <space divded argument + here> + ~nqk <space> + <divded> + <argument + here> +--- +name: IFS-subst-4-4p +description: + extended testsuite based on problem by mikeserv +stdin: + a='space divded argument + here' + IFS=\ ; set -- $a; IFS= + unset v + qs=${v:-"$*"} + printf '= qs '; printf '<%s>\n' "$qs" + printf '~ qs '; printf '<%s>\n' ${v:-"$*"} + nqs=${v:-$*} + printf '=nqs '; printf '<%s>\n' "$nqs" + printf '~nqs '; printf '<%s>\n' ${v:-$*} + qk=${v:-"$@"} + printf '= qk '; printf '<%s>\n' "$qk" + printf '~ qk '; printf '<%s>\n' ${v:-"$@"} + nqk=${v:-$@} + printf '=nqk '; printf '<%s>\n' "$nqk" + printf '~nqk '; printf '<%s>\n' ${v:-$@} +expected-stdout: + = qs <spacedivdedargument + here> + ~ qs <spacedivdedargument + here> + =nqs <spacedivdedargument + here> + ~nqs <space> + <divded> + <argument + here> + = qk <space divded argument + here> + ~ qk <space> + <divded> + <argument + here> + =nqk <space divded argument + here> + ~nqk <space> + <divded> + <argument + here> +--- +name: IFS-subst-4-5 +description: + extended testsuite based on problem by mikeserv +stdin: + a='space divded argument + here' + IFS=\ ; set -- $a; IFS=, + qs="$*" + printf '= qs '; printf '<%s>\n' "$qs" + printf '~ qs '; printf '<%s>\n' "$*" + nqs=$* + printf '=nqs '; printf '<%s>\n' "$nqs" + printf '~nqs '; printf '<%s>\n' $* + qk="$@" + printf '= qk '; printf '<%s>\n' "$qk" + printf '~ qk '; printf '<%s>\n' "$@" + nqk=$@ + printf '=nqk '; printf '<%s>\n' "$nqk" + printf '~nqk '; printf '<%s>\n' $@ +expected-stdout: + = qs <space,divded,argument + here> + ~ qs <space,divded,argument + here> + =nqs <space,divded,argument + here> + ~nqs <space> + <divded> + <argument + here> + = qk <space divded argument + here> + ~ qk <space> + <divded> + <argument + here> + =nqk <space divded argument + here> + ~nqk <space> + <divded> + <argument + here> +--- +name: IFS-subst-4-5p +description: + extended testsuite based on problem by mikeserv +stdin: + a='space divded argument + here' + IFS=\ ; set -- $a; IFS=, + unset v + qs=${v:-"$*"} + printf '= qs '; printf '<%s>\n' "$qs" + printf '~ qs '; printf '<%s>\n' ${v:-"$*"} + nqs=${v:-$*} + printf '=nqs '; printf '<%s>\n' "$nqs" + printf '~nqs '; printf '<%s>\n' ${v:-$*} + qk=${v:-"$@"} + printf '= qk '; printf '<%s>\n' "$qk" + printf '~ qk '; printf '<%s>\n' ${v:-"$@"} + nqk=${v:-$@} + printf '=nqk '; printf '<%s>\n' "$nqk" + printf '~nqk '; printf '<%s>\n' ${v:-$@} +expected-stdout: + = qs <space,divded,argument + here> + ~ qs <space,divded,argument + here> + =nqs <space,divded,argument + here> + ~nqs <space> + <divded> + <argument + here> + = qk <space divded argument + here> + ~ qk <space> + <divded> + <argument + here> + =nqk <space divded argument + here> + ~nqk <space> + <divded> + <argument + here> +--- +name: IFS-subst-5 +description: + extended testsuite based on IFS-subst-3 + differs slightly from ksh93: + - omit trailing field in a3zna, a7ina (unquoted $@ expansion) + - has extra middle fields in b5ins, b7ina (IFS_NWS unquoted expansion) + differs slightly from bash: + - omit leading field in a5ins, a7ina (IFS_NWS unquoted expansion) + differs slightly from zsh: + - differs in assignment, not expansion; probably zsh bug + - has extra middle fields in b5ins, b7ina (IFS_NWS unquoted expansion) + 'emulate sh' zsh has extra fields in + - a5ins (IFS_NWS unquoted $*) + - b5ins, matching mksh’s +stdin: + "$__progname" -c 'IFS=; set -- "" 2 ""; printf "[%s]\n" $*; x=$*; printf "<%s>\n" "$x"' + echo '=a1zns' + "$__progname" -c 'IFS=; set -- "" 2 ""; printf "[%s]\n" "$*"; x="$*"; printf "<%s>\n" "$x"' + echo '=a2zqs' + "$__progname" -c 'IFS=; set -- "" 2 ""; printf "[%s]\n" $@; x=$@; printf "<%s>\n" "$x"' + echo '=a3zna' + "$__progname" -c 'IFS=; set -- "" 2 ""; printf "[%s]\n" "$@"; x="$@"; printf "<%s>\n" "$x"' + echo '=a4zqa' + "$__progname" -c 'IFS=,; set -- "" 2 ""; printf "[%s]\n" $*; x=$*; printf "<%s>\n" "$x"' + echo '=a5ins' + "$__progname" -c 'IFS=,; set -- "" 2 ""; printf "[%s]\n" "$*"; x="$*"; printf "<%s>\n" "$x"' + echo '=a6iqs' + "$__progname" -c 'IFS=,; set -- "" 2 ""; printf "[%s]\n" $@; x=$@; printf "<%s>\n" "$x"' + echo '=a7ina' + "$__progname" -c 'IFS=,; set -- "" 2 ""; printf "[%s]\n" "$@"; x="$@"; printf "<%s>\n" "$x"' + echo '=a8iqa' + "$__progname" -c 'IFS=; set -- A B "" "" C; printf "[%s]\n" $*; x=$*; printf "<%s>\n" "$x"' + echo '=b1zns' + "$__progname" -c 'IFS=; set -- A B "" "" C; printf "[%s]\n" "$*"; x="$*"; printf "<%s>\n" "$x"' + echo '=b2zqs' + "$__progname" -c 'IFS=; set -- A B "" "" C; printf "[%s]\n" $@; x=$@; printf "<%s>\n" "$x"' + echo '=b3zna' + "$__progname" -c 'IFS=; set -- A B "" "" C; printf "[%s]\n" "$@"; x="$@"; printf "<%s>\n" "$x"' + echo '=b4zqa' + "$__progname" -c 'IFS=,; set -- A B "" "" C; printf "[%s]\n" $*; x=$*; printf "<%s>\n" "$x"' + echo '=b5ins' + "$__progname" -c 'IFS=,; set -- A B "" "" C; printf "[%s]\n" "$*"; x="$*"; printf "<%s>\n" "$x"' + echo '=b6iqs' + "$__progname" -c 'IFS=,; set -- A B "" "" C; printf "[%s]\n" $@; x=$@; printf "<%s>\n" "$x"' + echo '=b7ina' + "$__progname" -c 'IFS=,; set -- A B "" "" C; printf "[%s]\n" "$@"; x="$@"; printf "<%s>\n" "$x"' + echo '=b8iqa' +expected-stdout: + [2] + <2> + =a1zns + [2] + <2> + =a2zqs + [2] + < 2 > + =a3zna + [] + [2] + [] + < 2 > + =a4zqa + [2] + <,2,> + =a5ins + [,2,] + <,2,> + =a6iqs + [2] + < 2 > + =a7ina + [] + [2] + [] + < 2 > + =a8iqa + [A] + [B] + [C] + <ABC> + =b1zns + [ABC] + <ABC> + =b2zqs + [A] + [B] + [C] + <A B C> + =b3zna + [A] + [B] + [] + [] + [C] + <A B C> + =b4zqa + [A] + [B] + [] + [] + [C] + <A,B,,,C> + =b5ins + [A,B,,,C] + <A,B,,,C> + =b6iqs + [A] + [B] + [] + [] + [C] + <A B C> + =b7ina + [A] + [B] + [] + [] + [C] + <A B C> + =b8iqa +--- name: IFS-arith-1 description: http://austingroupbugs.net/view.php?id=832 @@ -7802,6 +8185,17 @@ expected-stdout: <1> <> <2> <> <+> <> <3> <> <+> <> . --- +name: varexpand-null-3 +description: + Ensure concatenating behaviour matches other shells + although the line 2<> is probably wrong? XNULLSUB case. +stdin: + x=; printf "1<%s>\n" "$x$@" + set A; printf "2<%s>\n" "${@:+}" +expected-stdout: + 1<> + 2<> +--- name: print-funny-chars description: Check print builtin's capability to output designated characters diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/eval.c new/mksh/eval.c --- old/mksh/eval.c 2014-07-29 18:29:36.000000000 +0200 +++ new/mksh/eval.c 2014-10-03 19:33:01.000000000 +0200 @@ -23,7 +23,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.151 2014/07/29 16:29:11 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.152 2014/10/03 17:32:11 tg Exp $"); /* * string expansion @@ -244,8 +244,8 @@ internal_errorf("expand(NULL)"); /* for alias, readonly, set, typeset commands */ if ((f & DOVACHECK) && is_wdvarassign(ccp)) { - f &= ~(DOVACHECK|DOBLANK|DOGLOB|DOTILDE); - f |= DOASNTILDE; + f &= ~(DOVACHECK | DOBLANK | DOGLOB | DOTILDE); + f |= DOASNTILDE | DOASNFIELD; } if (Flag(FNOGLOB)) f &= ~DOGLOB; @@ -261,7 +261,7 @@ fdo = 0; saw_eq = false; /* must be 1/0 */ - tilde_ok = (f & (DOTILDE|DOASNTILDE)) ? 1 : 0; + tilde_ok = (f & (DOTILDE | DOASNTILDE)) ? 1 : 0; doblank = 0; make_magic = false; word = (f&DOBLANK) ? IFS_WS : IFS_WORD; @@ -422,7 +422,7 @@ print_value_quoted(&shf, str_val(st->var)); x.str = shf_sclose(&shf); break; - } + } case '0': { char *beg, *mid, *end, *stg; mksh_ari_t from = 0, num = -1, flen, finc = 0; @@ -472,7 +472,7 @@ utfincptr(beg, &num); strndupx(x.str, beg, num, ATEMP); goto do_CSUBST; - } + } case '/': { char *s, *p, *d, *sbeg, *end; char *pat, *rrep; @@ -616,7 +616,7 @@ if (rrep != null) afree(rrep, ATEMP); goto do_CSUBST; - } + } case '#': case '%': /* ! DOBLANK,DOBRACE,DOTILDE */ @@ -649,7 +649,7 @@ * a arithmetic operator. */ if (!(x.var->flag & INTEGER)) - f |= DOASNTILDE|DOTILDE; + f |= DOASNTILDE | DOTILDE; f |= DOTEMP; /* * These will be done after the @@ -663,6 +663,7 @@ f |= DOTEMP; /* FALLTHROUGH */ default: + word = IFS_WORD; /* Enable tilde expansion */ tilde_ok = 1; f |= DOTILDE; @@ -671,7 +672,7 @@ /* skip word */ sp += wdscan(sp, CSUBST) - sp; continue; - } + } case CSUBST: /* only get here if expanding word */ do_CSUBST: @@ -741,6 +742,7 @@ if (f & DOBLANK) doblank++; st = st->prev; + word = quote || (!*x.str && (f & DOASNFIELD)) ? IFS_WORD : IFS_WS; continue; case '?': { char *s = Xrestpos(ds, dp, st->base); @@ -749,13 +751,14 @@ dp == s ? "parameter null or not set" : (debunk(s, s, strlen(s) + 1), s)); - } + } case '0': case '/': case 0x100 | '#': case 0x100 | 'Q': dp = Xrestpos(ds, dp, st->base); type = XSUB; + word = quote || (!*x.str && (f & DOASNFIELD)) ? IFS_WORD : IFS_WS; if (f & DOBLANK) doblank++; st = st->prev; @@ -795,13 +798,6 @@ type = XBASE; if (f & DOBLANK) { doblank--; - /* - * XXX not really correct: - * x=; "$x$@" - * should generate a null argument and - * set A; "${@:+}" - * shouldn't. - */ if (dp == Xstring(ds, dp)) word = IFS_WS; } @@ -825,7 +821,7 @@ if ((c = *x.str++) == '\0') { /* * force null words to be created so - * set -- '' 2 ''; foo "$@" will do + * set -- "" 2 ""; echo "$@" will do * the right thing */ if (quote && x.split) @@ -837,9 +833,21 @@ continue; } c = ifs0; + if ((f & DOASNFIELD)) { + /* assignment, do not field-split */ + if (x.split) { + c = ' '; + break; + } + if (c == 0) { + continue; + } + } if (c == 0) { if (quote && !x.split) continue; + if (!quote && word == IFS_WS) + continue; /* this is so we don't terminate */ c = ' '; /* now force-emit a word */ @@ -922,7 +930,8 @@ strlen(cp) + 1)); fdo = 0; saw_eq = false; - tilde_ok = (f & (DOTILDE|DOASNTILDE)) ? 1 : 0; + /* must be 1/0 */ + tilde_ok = (f & (DOTILDE | DOASNTILDE)) ? 1 : 0; if (c == 0) return; Xinit(ds, dp, 128, ATEMP); @@ -1006,7 +1015,7 @@ * through the sequence ${A=a=}~ */ if (type == XBASE && - (f & (DOTILDE|DOASNTILDE)) && + (f & (DOTILDE | DOASNTILDE)) && (tilde_ok & 2)) { const char *tcp; char *tdp = dp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/exec.c new/mksh/exec.c --- old/mksh/exec.c 2014-06-24 20:38:56.000000000 +0200 +++ new/mksh/exec.c 2014-10-03 19:33:01.000000000 +0200 @@ -23,7 +23,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.132 2014/06/24 18:38:31 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.133 2014/10/03 17:32:11 tg Exp $"); #ifndef MKSH_DEFAULT_EXECSHELL #define MKSH_DEFAULT_EXECSHELL "/bin/sh" @@ -635,7 +635,7 @@ for (i = 0; t->vars[i]; i++) { /* do NOT lookup in the new var/fn block just created */ e->loc = l_expand; - cp = evalstr(t->vars[i], DOASNTILDE); + cp = evalstr(t->vars[i], DOASNTILDE | DOASNFIELD); e->loc = l_assign; if (Flag(FXTRACE)) { const char *ccp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/funcs.c new/mksh/funcs.c --- old/mksh/funcs.c 2014-07-28 23:46:09.000000000 +0200 +++ new/mksh/funcs.c 2014-09-03 21:56:41.000000000 +0200 @@ -1,5 +1,5 @@ /* $OpenBSD: c_ksh.c,v 1.34 2013/12/17 16:37:05 deraadt Exp $ */ -/* $OpenBSD: c_sh.c,v 1.44 2013/09/04 15:49:18 millert Exp $ */ +/* $OpenBSD: c_sh.c,v 1.45 2014/08/27 08:26:04 jmc Exp $ */ /* $OpenBSD: c_test.c,v 1.18 2009/03/01 20:11:06 otto Exp $ */ /* $OpenBSD: c_ulimit.c,v 1.19 2013/11/28 10:33:37 sobrado Exp $ */ @@ -38,7 +38,7 @@ #endif #endif -__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.257 2014/07/28 21:45:44 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.258 2014/09/03 19:55:51 tg Exp $"); #if HAVE_KILLPG /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/jobs.c new/mksh/jobs.c --- old/mksh/jobs.c 2014-06-11 00:17:34.000000000 +0200 +++ new/mksh/jobs.c 2014-10-03 14:33:38.000000000 +0200 @@ -23,7 +23,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.104 2014/06/10 22:17:09 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.105 2014/10/03 12:32:48 tg Exp $"); #if HAVE_KILLPG #define mksh_killpg killpg @@ -1339,7 +1339,7 @@ do { #ifndef MKSH_NOPROSPECTOFWORK pid = waitpid(-1, &status, (WNOHANG | -#ifdef WCONTINUED +#if defined(WCONTINUED) && defined(WIFCONTINUED) WCONTINUED | #endif WUNTRACED)); @@ -1381,7 +1381,7 @@ if (WIFSTOPPED(status)) p->state = PSTOPPED; else -#ifdef WIFCONTINUED +#if defined(WCONTINUED) && defined(WIFCONTINUED) if (WIFCONTINUED(status)) { p->state = j->state = PRUNNING; /* skip check_job(), no-op in this case */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/main.c new/mksh/main.c --- old/mksh/main.c 2014-06-09 14:28:42.000000000 +0200 +++ new/mksh/main.c 2014-10-03 19:20:17.000000000 +0200 @@ -1,6 +1,6 @@ /* $OpenBSD: main.c,v 1.54 2013/11/28 10:33:37 sobrado Exp $ */ -/* $OpenBSD: tty.c,v 1.9 2006/03/14 22:08:01 deraadt Exp $ */ -/* $OpenBSD: io.c,v 1.23 2013/12/17 16:37:06 deraadt Exp $ */ +/* $OpenBSD: tty.c,v 1.10 2014/08/10 02:44:26 guenther Exp $ */ +/* $OpenBSD: io.c,v 1.25 2014/08/11 20:28:47 guenther Exp $ */ /* $OpenBSD: table.c,v 1.15 2012/02/19 07:52:30 otto Exp $ */ /*- @@ -34,7 +34,7 @@ #include <locale.h> #endif -__RCSID("$MirOS: src/bin/mksh/main.c,v 1.280 2014/06/09 12:28:17 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/main.c,v 1.284 2014/10/03 17:19:27 tg Exp $"); extern char **environ; @@ -63,7 +63,7 @@ static const char *initcoms[] = { Ttypeset, "-r", initvsn, NULL, - Ttypeset, "-x", "HOME", "PATH", "RANDOM", "SHELL", NULL, + Ttypeset, "-x", "HOME", "PATH", "SHELL", NULL, Ttypeset, "-i10", "COLUMNS", "LINES", "SECONDS", "TMOUT", NULL, Talias, "integer=typeset -i", @@ -184,7 +184,7 @@ int argi, i; Source *s = NULL; struct block *l; - unsigned char restricted, errexit, utf_flag; + unsigned char restricted_shell, errexit, utf_flag; char *cp; const char *ccp, **wp; struct tbl *vp; @@ -407,7 +407,11 @@ setint_n((vp_pipest = global("PIPESTATUS")), 0, 10); /* Set this before parsing arguments */ - Flag(FPRIVILEGED) = (kshuid != ksheuid || kshgid != kshegid) ? 2 : 0; + Flag(FPRIVILEGED) = ( +#if HAVE_ISSETUGID + issetugid() || +#endif + kshuid != ksheuid || kshgid != kshegid) ? 2 : 0; /* this to note if monitor is set on command line (see below) */ #ifndef MKSH_UNEMPLOYED @@ -573,7 +577,7 @@ } /* Disable during .profile/ENV reading */ - restricted = Flag(FRESTRICTED); + restricted_shell = Flag(FRESTRICTED); Flag(FRESTRICTED) = 0; errexit = Flag(FERREXIT); Flag(FERREXIT) = 0; @@ -603,7 +607,7 @@ change_flag(FPRIVILEGED, OF_INTERNAL, false); } - if (restricted) { + if (restricted_shell) { shcomexec(restr_com); /* After typeset command... */ Flag(FRESTRICTED) = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/mirhash.h new/mksh/mirhash.h --- old/mksh/mirhash.h 2014-06-29 13:48:30.000000000 +0200 +++ new/mksh/mirhash.h 2014-10-02 21:34:56.000000000 +0200 @@ -30,6 +30,12 @@ * for speed reasons, specified for the regular stable hash, but very * much recommended if the actual output value may differ across runs * (so is using a random value instead of 0 for the IV). + *- + * Little quote gem: + * We are looking into it. Changing the core + * hash function in PHP isn't a trivial change + * and will take us some time. + * -- Rasmus Lerdorf */ #ifndef SYSKERN_MIRHASH_H @@ -38,7 +44,7 @@ #include <sys/types.h> -__RCSID("$MirOS: src/bin/mksh/mirhash.h,v 1.2 2014/06/29 11:48:05 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/mirhash.h,v 1.3 2014/10/02 19:34:06 tg Exp $"); /*- * BAFH itself is defined by the following primitives: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/mksh.1 new/mksh/mksh.1 --- old/mksh/mksh.1 2014-07-29 19:26:49.000000000 +0200 +++ new/mksh/mksh.1 2014-10-03 14:36:28.000000000 +0200 @@ -1,5 +1,5 @@ -.\" $MirOS: src/bin/mksh/mksh.1,v 1.340 2014/07/29 17:26:24 tg Exp $ -.\" $OpenBSD: ksh.1,v 1.152 2014/02/12 16:28:13 schwarze Exp $ +.\" $MirOS: src/bin/mksh/mksh.1,v 1.343 2014/10/03 12:35:38 tg Exp $ +.\" $OpenBSD: ksh.1,v 1.153 2014/08/17 07:15:41 jmc Exp $ .\"- .\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, .\" 2010, 2011, 2012, 2013, 2014 @@ -74,7 +74,7 @@ .\" with -mandoc, it might implement .Mx itself, but we want to .\" use our own definition. And .Dd must come *first*, always. .\" -.Dd $Mdocdate: July 29 2014 $ +.Dd $Mdocdate: October 3 2014 $ .\" .\" Check which macro package we use, and do other -mdoc setup. .\" @@ -1875,6 +1875,9 @@ .It Ev HISTSIZE The number of commands normally stored for history. The default is 2047. +Do not set this value to insanely high values such as 1000000000 because +.Nm +can then not allocate enough memory for the history and will not start. .It Ev HOME The default directory for the .Ic cd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/sh.h new/mksh/sh.h --- old/mksh/sh.h 2014-09-03 21:23:15.000000000 +0200 +++ new/mksh/sh.h 2014-10-03 19:33:02.000000000 +0200 @@ -169,9 +169,9 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.694 2014/09/03 19:22:50 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.695 2014/10/03 17:32:12 tg Exp $"); #endif -#define MKSH_VERSION "R50 2014/09/03" +#define MKSH_VERSION "R50 2014/10/03" /* arithmetic types: C implementation */ #if !HAVE_CAN_INTTYPES @@ -533,7 +533,7 @@ #define mkssert(e) do { } while (/* CONSTCOND */ 0) #endif -#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 502) +#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 503) #error Must run Build.sh to compile this. extern void thiswillneverbedefinedIhope(void); int @@ -1396,6 +1396,7 @@ #define DOVACHECK BIT(9) /* var assign check (for typeset, set, etc) */ #define DOMARKDIRS BIT(10) /* force markdirs behaviour */ #define DOTCOMEXEC BIT(11) /* not an eval flag, used by sh -c hack */ +#define DOASNFIELD BIT(12) /* is assignment, change field handling */ #define X_EXTRA 20 /* this many extra bytes in X string */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksh/var.c new/mksh/var.c --- old/mksh/var.c 2014-09-03 21:23:16.000000000 +0200 +++ new/mksh/var.c 2014-10-03 19:20:53.000000000 +0200 @@ -28,7 +28,7 @@ #include <sys/sysctl.h> #endif -__RCSID("$MirOS: src/bin/mksh/var.c,v 1.181 2014/09/03 19:22:51 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/var.c,v 1.182 2014/10/03 17:20:03 tg Exp $"); /*- * Variables @@ -751,18 +751,18 @@ } val += len; } - if (val[0] == '=' || (val[0] == '+' && val[1] == '=')) { + if (val[0] == '=') { strndupx(tvar, var, val - var, ATEMP); - if (*val++ == '+') { - ++val; - vappend = true; - } - } else if ((val[0] != '\0') || (set & IMPORT)) { - /* - * must have a = when setting a variable by importing - * the original environment, otherwise be empty; we - * also end up here when a variable name was invalid - */ + ++val; + } else if (set & IMPORT) { + /* environment invalid variable name or no assignment */ + return (NULL); + } else if (val[0] == '+' && val[1] == '=') { + strndupx(tvar, var, val - var, ATEMP); + val += 2; + vappend = true; + } else if (val[0] != '\0') { + /* other invalid variable names (not from environment) */ return (NULL); } else { /* just varname with no value part nor equals sign */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libunicap for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package libunicap for openSUSE:Factory checked in at 2014-10-05 20:31:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libunicap (Old) and /work/SRC/openSUSE:Factory/.libunicap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libunicap" Changes: -------- --- /work/SRC/openSUSE:Factory/libunicap/libunicap.changes 2013-05-07 07:27:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libunicap.new/libunicap.changes 2014-10-05 20:33:33.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Oct 1 20:19:24 UTC 2014 - crrodriguez(a)opensuse.org + +- Remove x11 libs buildrequires, never directly linked. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libunicap.spec ++++++ --- /var/tmp/diff_new_pack.a6dMES/_old 2014-10-05 20:33:34.000000000 +0200 +++ /var/tmp/diff_new_pack.a6dMES/_new 2014-10-05 20:33:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libunicap # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -48,10 +48,6 @@ BuildRequires: libtheora-devel BuildRequires: libvorbis-devel BuildRequires: pkgconfig -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libICE-devel -BuildRequires: xorg-x11-libXext-devel -BuildRequires: xorg-x11-libXv-devel BuildRequires: perl(XML::Parser) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-http-server for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2014-10-05 20:31:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-http-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2014-09-17 17:27:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2014-10-05 20:33:33.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 3 08:37:15 UTC 2014 - ancor(a)suse.com + +- Dropped the usage of deprecated directives Order, Allow and Deny + in favor of mod_authz_host. +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-http-server-3.1.4.tar.bz2 New: ---- yast2-http-server-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.OqYpEA/_old 2014-10-05 20:33:33.000000000 +0200 +++ /var/tmp/diff_new_pack.OqYpEA/_new 2014-10-05 20:33:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-http-server-3.1.4.tar.bz2 -> yast2-http-server-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.4/MAINTAINER new/yast2-http-server-3.1.5/MAINTAINER --- old/yast2-http-server-3.1.4/MAINTAINER 2014-09-16 15:43:09.000000000 +0200 +++ new/yast2-http-server-3.1.5/MAINTAINER 2014-10-03 17:38:11.000000000 +0200 @@ -1 +1 @@ -YaST2 Maintainers <yast2-maintainers(a)suse.de> +Deprecated file. Use `osc maintainer yast2-http-server` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.4/package/yast2-http-server.changes new/yast2-http-server-3.1.5/package/yast2-http-server.changes --- old/yast2-http-server-3.1.4/package/yast2-http-server.changes 2014-09-16 15:43:09.000000000 +0200 +++ new/yast2-http-server-3.1.5/package/yast2-http-server.changes 2014-10-03 17:38:11.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 3 08:37:15 UTC 2014 - ancor(a)suse.com + +- Dropped the usage of deprecated directives Order, Allow and Deny + in favor of mod_authz_host. +- 3.1.5 + +------------------------------------------------------------------- Tue Sep 16 09:14:59 CEST 2014 - schubi(a)suse.de - AutoYaST: Using HostIP which is given in the host name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.4/package/yast2-http-server.spec new/yast2-http-server-3.1.5/package/yast2-http-server.spec --- old/yast2-http-server-3.1.4/package/yast2-http-server.spec 2014-09-16 15:43:09.000000000 +0200 +++ new/yast2-http-server-3.1.5/package/yast2-http-server.spec 2014-10-03 17:38:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.4/src/modules/HttpServerWidgets.rb new/yast2-http-server-3.1.5/src/modules/HttpServerWidgets.rb --- old/yast2-http-server-3.1.4/src/modules/HttpServerWidgets.rb 2014-09-16 15:43:09.000000000 +0200 +++ new/yast2-http-server-3.1.5/src/modules/HttpServerWidgets.rb 2014-10-03 17:38:11.000000000 +0200 @@ -1675,8 +1675,7 @@ "SECTIONPARAM" => documentroot, "VALUE" => [ { "KEY" => "AllowOverride", "VALUE" => "None" }, - { "KEY" => "Order", "VALUE" => "allow,deny" }, - { "KEY" => "Allow", "VALUE" => "from all" } + { "KEY" => "Require", "VALUE" => "all granted" } ], "OVERHEAD" => "" } @@ -2093,8 +2092,7 @@ "VALUE" => [ { "KEY" => "AllowOverride", "VALUE" => "None" }, { "KEY" => "Options", "VALUE" => "+ExecCGI -Includes" }, - { "KEY" => "Order", "VALUE" => "allow,deny" }, - { "KEY" => "Allow", "VALUE" => "from all" } + { "KEY" => "Require", "VALUE" => "all granted" } ], "OVERHEAD" => "" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.4/src/modules/YaPI/HTTPDModules.pm new/yast2-http-server-3.1.5/src/modules/YaPI/HTTPDModules.pm --- old/yast2-http-server-3.1.4/src/modules/YaPI/HTTPDModules.pm 2014-09-16 15:43:09.000000000 +0200 +++ new/yast2-http-server-3.1.5/src/modules/YaPI/HTTPDModules.pm 2014-10-03 17:38:11.000000000 +0200 @@ -14,9 +14,7 @@ packages => [], default => 1, position => 10, - directives=> [ { option => "Allow", "context" => [ "Directory" ] }, - { option => "Deny", "context" => [ "Directory" ] }, - { option => "Order", "context" => [ "Directory" ], "values" => [ "Deny,Allow", "Allow,Deny", "Mutual-failure" ] } + directives=> [ { option => "Require", "context" => [ "Directory", "Files", "Location" ] } ] }, 'actions' => { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.4/src/modules/YaST/HTTPDData.pm new/yast2-http-server-3.1.5/src/modules/YaST/HTTPDData.pm --- old/yast2-http-server-3.1.4/src/modules/YaST/HTTPDData.pm 2014-09-16 15:43:09.000000000 +0200 +++ new/yast2-http-server-3.1.5/src/modules/YaST/HTTPDData.pm 2014-10-03 17:38:11.000000000 +0200 @@ -88,12 +88,8 @@ 'VALUE' => 'None' }, { - 'KEY' => 'Order', - 'VALUE' => 'allow,deny' - }, - { - 'KEY' => 'Allow', - 'VALUE' => 'from all' + 'KEY' => 'Require', + 'VALUE' => 'all granted' } ] }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.4/testsuite/tests/readHosts.out new/yast2-http-server-3.1.5/testsuite/tests/readHosts.out --- old/yast2-http-server-3.1.4/testsuite/tests/readHosts.out 2014-09-16 15:43:09.000000000 +0200 +++ new/yast2-http-server-3.1.5/testsuite/tests/readHosts.out 2014-10-03 17:38:11.000000000 +0200 @@ -1,5 +1,5 @@ -Read .http_server.vhosts $["default-server.conf":[$["DATA":[$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Order", "OVERHEAD":"", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]], "HOSTID":"default", "VirtualByName":"0"]], "yast2_vhosts.conf":[$["DATA":[$["KEY":"DocumentRoot", "VALUE":"/srv/viewcvs/"], $["KEY":"ServerName", "VALUE":"TestNew"], $["KEY":"ServerAdmin", "VALUE":"ja(a)ja.sk"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]], "HOSTID":"10.20.1.28/TestNew", "HostIP":"10.20.1.28", "VirtualByName":"1"], $["OVERHEAD":""]]] +Read .http_server.vhosts $["default-server.conf":[$["DATA":[$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]], "HOSTID":"default", "VirtualByName":"0"]], "yast2_vhosts.conf":[$["DATA":[$["KEY":"DocumentRoot", "VALUE":"/srv/viewcvs/"], $["KEY":"ServerName", "VALUE":"TestNew"], $["KEY":"ServerAdmin", "VALUE":"ja(a)ja.sk"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]], "HOSTID":"10.20.1.28/TestNew", "HostIP":"10.20.1.28", "VirtualByName":"1"], $["OVERHEAD":""]]] Return true Return ["default", "10.20.1.28/TestNew"] Return [$["KEY":"DocumentRoot", "VALUE":"/srv/viewcvs/"], $["KEY":"ServerName", "VALUE":"TestNew"], $["KEY":"ServerAdmin", "VALUE":"ja(a)ja.sk"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]] -Return [$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Order", "OVERHEAD":"", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]] +Return [$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.4/testsuite/tests/readHosts.rb new/yast2-http-server-3.1.5/testsuite/tests/readHosts.rb --- old/yast2-http-server-3.1.4/testsuite/tests/readHosts.rb 2014-09-16 15:43:09.000000000 +0200 +++ new/yast2-http-server-3.1.5/testsuite/tests/readHosts.rb 2014-10-03 17:38:11.000000000 +0200 @@ -36,12 +36,7 @@ "OVERHEAD" => "", "VALUE" => "None" }, - { - "KEY" => "Order", - "OVERHEAD" => "", - "VALUE" => "allow,deny" - }, - { "KEY" => "Allow", "VALUE" => "from all" } + { "KEY" => "Require", "VALUE" => "all granted" } ] }, { @@ -57,8 +52,7 @@ "VALUE" => [ { "KEY" => "Options", "VALUE" => "Indexes MultiViews" }, { "KEY" => "AllowOverride", "VALUE" => "None" }, - { "KEY" => "Order", "VALUE" => "allow,deny" }, - { "KEY" => "Allow", "VALUE" => "from all" } + { "KEY" => "Require", "VALUE" => "all granted" } ] }, { @@ -74,8 +68,7 @@ "VALUE" => [ { "KEY" => "AllowOverride", "VALUE" => "None" }, { "KEY" => "Options", "VALUE" => "+ExecCGI -Includes" }, - { "KEY" => "Order", "VALUE" => "allow,deny" }, - { "KEY" => "Allow", "VALUE" => "from all" } + { "KEY" => "Require", "VALUE" => "all granted" } ] }, { @@ -116,8 +109,7 @@ "VALUE" => [ { "KEY" => "Options", "VALUE" => "None" }, { "KEY" => "AllowOverride", "VALUE" => "None" }, - { "KEY" => "Order", "VALUE" => "allow,deny" }, - { "KEY" => "Allow", "VALUE" => "from all" } + { "KEY" => "Require", "VALUE" => "all granted" } ] }, { "KEY" => "NameVirtualHost", "VALUE" => "10.20.1.28" }, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0