November 2017 - openSUSE Commits - openSUSE Mailing Lists

commit xcowsay for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package xcowsay for openSUSE:Factory checked in at 2017-11-30 12:44:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcowsay (Old) and /work/SRC/openSUSE:Factory/.xcowsay.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xcowsay" Thu Nov 30 12:44:34 2017 rev:2 rq:545411 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xcowsay/xcowsay.changes 2016-07-09 09:22:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xcowsay.new/xcowsay.changes 2017-11-30 12:44:35.363668114 +0100 @@ -1,0 +2,6 @@ +Sat Nov 25 02:46:53 UTC 2017 - wnereiz(a)eienteiland.org + +- Remove xcowfortune ("remove_xcowfortune.patch") because fortune will be dropped. +- Add xcowsay.svg and xcowsay.desktop + +------------------------------------------------------------------- Old: ---- xcowfortune.desktop xcowfortune.svg New: ---- remove_xcowfortune.patch xcowsay.desktop xcowsay.svg ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcowsay.spec ++++++ --- /var/tmp/diff_new_pack.jtBDpO/_old 2017-11-30 12:44:36.371631470 +0100 +++ /var/tmp/diff_new_pack.jtBDpO/_new 2017-11-30 12:44:36.371631470 +0100 @@ -1,7 +1,7 @@ # # spec file for package xcowsay # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xcowsay Version: 1.3 Release: 0 -License: GPL-3.0+ Summary: Displays a cute cow and message on your Linux desktop -Url: http://www.doof.me.uk/xcowsay/ +License: GPL-3.0+ Group: Amusements/Toys/Other +Url: http://www.doof.me.uk/xcowsay/ Source: http://www.nickg.me.uk/files/xcowsay-1.3.tar.gz -Source1: xcowfortune.desktop -Source2: xcowfortune.svg +Source1: xcowsay.desktop +Source2: xcowsay.svg Source3: xcowhelp.desktop Source4: xcowhelp.svg -BuildRequires: gtk2-devel +Patch0: remove_xcowfortune.patch BuildRequires: dbus-1-glib-devel -BuildRequires: update-desktop-files +BuildRequires: gtk2-devel BuildRequires: hicolor-icon-theme +BuildRequires: update-desktop-files Requires: gtk2 -Requires: fortune BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,7 +47,7 @@ - Can draw thought and speech bubbles - Daemon mode! Send your cow messages over DBus! - Three different sized cows provided -- fortune(6) wrapper program: xcowfortune — cow will deliver pearls of wisdom! +- fortune(6) wrapper program - (unavailable temporarily) - Replace the naffness that is xmessage(1) - Should work with any window manager - Supports UTF-8 characters properly @@ -55,6 +56,7 @@ %prep %setup -q +%patch0 -p1 %post %icon_theme_cache_post @@ -67,25 +69,23 @@ make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} +%make_install %find_lang xcowsay -%suse_update_desktop_file -i xcowfortune +%suse_update_desktop_file -i xcowsay %suse_update_desktop_file -i xcowhelp mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps cp -a %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps cp -a %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps %files -f xcowsay.lang -%defattr(-,root,root) %doc ChangeLog COPYING README AUTHORS %{_bindir}/xcowdream -%{_bindir}/xcowfortune %{_bindir}/xcowsay %{_bindir}/xcowthink -%{_mandir}/man6/xcowsay.6.gz +%{_mandir}/man6/xcowsay.6%{ext_man} %{_datadir}/xcowsay -%{_datadir}/applications/xcowfortune.desktop %{_datadir}/applications/xcowhelp.desktop +%{_datadir}/applications/xcowsay.desktop %{_datadir}/icons/hicolor/ %changelog ++++++ remove_xcowfortune.patch ++++++ diff -Nur a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am 2010-09-28 04:27:52.000000000 +0800 +++ b/src/Makefile.am 2017-11-25 10:04:25.857007395 +0800 @@ -8,4 +8,4 @@ floating_shape.c settings.h settings.c Cowsay_glue.h xcowsayd.h \ xcowsayd.c config_file.h config_file.c i18n.h bubblegen.c -EXTRA_DIST = xcowfortune xcowdream xcowthink +EXTRA_DIST = xcowdream xcowthink diff -Nur a/src/Makefile.in b/src/Makefile.in --- a/src/Makefile.in 2010-11-06 23:22:43.000000000 +0800 +++ b/src/Makefile.in 2017-11-25 10:15:33.777005477 +0800 @@ -213,14 +213,14 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -bin_SCRIPTS = xcowfortune xcowdream xcowthink +bin_SCRIPTS = xcowdream xcowthink AM_CFLAGS = $(XCOWSAY_CFLAGS) -Wall LDADD = $(XCOWSAY_LIBS) xcowsay_SOURCES = xcowsay.c display_cow.c display_cow.h floating_shape.h \ floating_shape.c settings.h settings.c Cowsay_glue.h xcowsayd.h \ xcowsayd.c config_file.h config_file.c i18n.h bubblegen.c -EXTRA_DIST = xcowfortune xcowdream xcowthink +EXTRA_DIST = xcowdream xcowthink all: all-am .SUFFIXES: ++++++ xcowsay.desktop ++++++ [Desktop Entry] Type=Application Encoding=UTF-8 Categories=Game;Amusement; Name=xcowsay GenericName=xcowsay Icon=xcowsay Terminal=false Comment= Displays a cute cow and message on your Linux desktop Exec=xcowsay

1 0

commit unity-gtk-module for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package unity-gtk-module for openSUSE:Factory checked in at 2017-11-30 12:44:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unity-gtk-module (Old) and /work/SRC/openSUSE:Factory/.unity-gtk-module.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "unity-gtk-module" Thu Nov 30 12:44:32 2017 rev:3 rq:545342 version:0.0.0+bzr20170817 Changes: -------- --- /work/SRC/openSUSE:Factory/unity-gtk-module/unity-gtk-module.changes 2017-10-19 19:32:36.411556733 +0200 +++ /work/SRC/openSUSE:Factory/.unity-gtk-module.new/unity-gtk-module.changes 2017-11-30 12:44:33.259744601 +0100 @@ -1,0 +2,10 @@ +Fri Nov 24 20:58:01 UTC 2017 - sor.alexei(a)meowr.ru + +- Fix unity-gtk-module-gsettings.patch: disable + gtk2-shell-shows-menubar by default, as it forcefully changes + system's behaviour after a mere package installation + (boo#1044790). +- Use GTK2_MODULES and GTK3_MODULES instead of GTK_MODULES + (boo#1048184). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unity-gtk-module.spec ++++++ --- /var/tmp/diff_new_pack.ZkDRnX/_old 2017-11-30 12:44:33.851723080 +0100 +++ /var/tmp/diff_new_pack.ZkDRnX/_new 2017-11-30 12:44:33.855722935 +0100 @@ -122,20 +122,26 @@ %patch0 cat > %{name}.sh << EOF -if [ -z "\$%{nil}GTK_MODULES" ]; then - export GTK_MODULES="unity-gtk-module" -else - export GTK_MODULES="\$%{nil}GTK_MODULES:%{name}" +if [ -f "%{_libdir}/gtk-2.0/modules/lib%{name}.so" ]; then + export GTK2_MODULES="\$%{nil}{GTK2_MODULES:+\$%{nil}GTK2_MODULES:}unity-gtk-module" +fi +if [ -f "%{_libdir}/gtk-3.0/modules/lib%{name}.so" ]; then + export GTK3_MODULES="\$%{nil}{GTK3_MODULES:+\$%{nil}GTK3_MODULES:}unity-gtk-module" fi if [ -z "\$%{nil}UBUNTU_MENUPROXY" ]; then export UBUNTU_MENUPROXY=1 fi EOF cat > %{name}.csh << EOF -if ( ! \$%{nil}?GTK_MODULES ) then - setenv GTK_MODULES "unity-gtk-module" -else - setenv GTK_MODULES "\$%{nil}{GTK_MODULES}:%{name}" +if ( -f "%{_libdir}/gtk-2.0/modules/lib%{name}.so" ) then + if ( ! \$%{nil}?GTK2_MODULES ) set GTK2_MODULES="" + if ( \$%{nil}?GTK2_MODULES ) setenv GTK2_MODULES "\$%{nil}GTK2_MODULES\:" + setenv GTK2_MODULES "\$%{nil}{GTK2_MODULES}unity-gtk-module" +endif +if ( -f "%{_libdir}/gtk-3.0/modules/lib%{name}.so" ) then + if ( ! \$%{nil}?GTK3_MODULES ) set GTK3_MODULES="" + if ( \$%{nil}?GTK3_MODULES ) setenv GTK3_MODULES "\$%{nil}GTK3_MODULES\:" + setenv GTK3_MODULES "\$%{nil}{GTK3_MODULES}unity-gtk-module" endif if ( ! \$%{nil}?UBUNTU_MENUPROXY ) then setenv UBUNTU_MENUPROXY 1 ++++++ unity-gtk-module-gsettings.patch ++++++ --- /var/tmp/diff_new_pack.ZkDRnX/_old 2017-11-30 12:44:33.887721772 +0100 +++ /var/tmp/diff_new_pack.ZkDRnX/_new 2017-11-30 12:44:33.891721626 +0100 @@ -1,21 +1,19 @@ -=== modified file 'data/com.canonical.unity-gtk-module.gschema.xml' ---- data/com.canonical.unity-gtk-module.gschema.xml 2013-11-14 18:51:01 +0000 -+++ data/com.canonical.unity-gtk-module.gschema.xml 2015-04-03 16:28:11 +0000 +--- data/com.canonical.unity-gtk-module.gschema.xml ++++ data/com.canonical.unity-gtk-module.gschema.xml @@ -11,5 +11,10 @@ <description>List of applications where unity-gtk-module should be enabled.</description> <default>[]</default> </key> + <key name="gtk2-shell-shows-menubar" type="b"> + <summary>Determines GTK2 menus behaviour</summary> -+ <description>This key is ubuntu gtk patch replacement.</description> -+ <default>true</default> ++ <description>This key is the ubuntu gtk patch replacement.</description> ++ <default>false</default> + </key> </schema> </schemalist> -=== modified file 'src/main.c' ---- src/main.c 2014-06-09 03:50:16 +0000 -+++ src/main.c 2015-04-03 16:46:46 +0000 +--- src/main.c ++++ src/main.c @@ -43,6 +43,7 @@ #define UNITY_GTK_MODULE_SCHEMA "com.canonical.unity-gtk-module" #define BLACKLIST_KEY "blacklist" @@ -28,7 +26,7 @@ } } -+#if GTK_MAJOR_VERSION == 3 ++#if GTK_CHECK_VERSION (3, 0, 0) static gboolean gtk_widget_shell_shows_menubar (GtkWidget *widget) { @@ -38,9 +36,9 @@ } +#else +static void -+g_settings_handle_gtk_shell_shows_menubar (GSettings *settings, -+ gchar *key, -+ gpointer user_data) ++g_settings_handle_gtk_shell_shows_menubar (GSettings *settings, ++ gchar *key, ++ gpointer user_data) +{ + gtk_widget_queue_resize (user_data); +} @@ -48,11 +46,11 @@ +static gboolean +gtk_widget_shell_shows_menubar (GtkWidget *widget) +{ -+ GSettings* settings = G_SETTINGS(g_object_get_data(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA)); ++ GSettings *settings = G_SETTINGS (g_object_get_data (G_OBJECT (widget), UNITY_GTK_MODULE_SCHEMA)); + if (settings == NULL) + { -+ settings = g_settings_new(UNITY_GTK_MODULE_SCHEMA); -+ g_object_set_data_full(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA,(gpointer)settings,(GDestroyNotify)g_object_unref); ++ settings = g_settings_new (UNITY_GTK_MODULE_SCHEMA); ++ g_object_set_data_full (G_OBJECT(widget), UNITY_GTK_MODULE_SCHEMA, (gpointer) settings, (GDestroyNotify) g_object_unref); + g_signal_connect (settings, "changed::"SHELL_SHOWS_MENUBAR_KEY, G_CALLBACK (g_settings_handle_gtk_shell_shows_menubar), widget); + } + return g_settings_get_boolean (settings,SHELL_SHOWS_MENUBAR_KEY); @@ -78,15 +76,15 @@ +hijacked_menu_bar_realize (GtkWidget *widget) +{ + GtkWidget *window; -+ GSettings* settings; ++ GSettings *settings; + + g_return_if_fail (GTK_IS_MENU_BAR (widget)); + -+ settings = G_SETTINGS(g_object_get_data(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA)); ++ settings = G_SETTINGS (g_object_get_data (G_OBJECT(widget), UNITY_GTK_MODULE_SCHEMA)); + if (settings == NULL) + { -+ settings = g_settings_new(UNITY_GTK_MODULE_SCHEMA); -+ g_object_set_data_full(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA,(gpointer)settings,(GDestroyNotify)g_object_unref); ++ settings = g_settings_new (UNITY_GTK_MODULE_SCHEMA); ++ g_object_set_data_full (G_OBJECT(widget), UNITY_GTK_MODULE_SCHEMA, (gpointer) settings, (GDestroyNotify) g_object_unref); + g_signal_connect (settings, "changed::"SHELL_SHOWS_MENUBAR_KEY, G_CALLBACK (g_settings_handle_gtk_shell_shows_menubar), widget); + } + @@ -107,13 +105,13 @@ + + g_return_if_fail (GTK_IS_MENU_BAR (widget)); + -+ settings = G_SETTINGS(g_object_get_data (G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA)); ++ settings = G_SETTINGS (g_object_get_data (G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA)); + menu_shell_data = gtk_menu_shell_get_menu_shell_data (GTK_MENU_SHELL (widget)); + + if (settings != NULL) + { + g_signal_handlers_disconnect_by_data (settings, widget); -+ g_object_set_data(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA,NULL); ++ g_object_set_data (G_OBJECT (widget), UNITY_GTK_MODULE_SCHEMA, NULL); + } + + if (menu_shell_data->window != NULL)

1 0

commit igerman98 for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package igerman98 for openSUSE:Factory checked in at 2017-11-30 12:44:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/igerman98 (Old) and /work/SRC/openSUSE:Factory/.igerman98.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "igerman98" Thu Nov 30 12:44:30 2017 rev:29 rq:516073 version:20161207 Changes: -------- --- /work/SRC/openSUSE:Factory/igerman98/igerman98.changes 2017-07-07 10:16:55.454945289 +0200 +++ /work/SRC/openSUSE:Factory/.igerman98.new/igerman98.changes 2017-11-30 12:44:31.299815854 +0100 @@ -1,0 +2,5 @@ +Fri Aug 11 08:48:23 UTC 2017 - pgajdos(a)suse.com + +- remove aspell dictionaries [bsc#1052951] + +------------------------------------------------------------------- Old: ---- Nwordlist.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ igerman98.spec ++++++ --- /var/tmp/diff_new_pack.9vtvSG/_old 2017-11-30 12:44:32.139785317 +0100 +++ /var/tmp/diff_new_pack.9vtvSG/_new 2017-11-30 12:44:32.147785026 +0100 @@ -16,7 +16,6 @@ # -%define aspell_dict_dir %(aspell dump config dict-dir) %define ispell_dict_dir %(ispell -vv|grep LIBDIR|sed \"s/.*\=//;s/^ //g\" |tr -d \\") %define ispell_emacs_lib_dir %{_prefix}/lib/ispell/emacs Name: igerman98 @@ -24,24 +23,21 @@ Release: 0 Summary: German Spell Check Dictionaries # According to Documentation/Copyright we can distribute program under GPL-2.0 -# or GPL-3.0. We have choosed GPL-2.0. More over, aspell/de_all_phonet.dat.in -# is LGPL-2.1, so adding it to license string. -License: GPL-2.0 AND LGPL-2.1 +# or GPL-3.0. We have choosed GPL-2.0. +License: GPL-2.0 Group: Productivity/Text/Spell Url: http://www.j3e.de/ispell/igerman98/dict/ Source0: https://www.j3e.de/ispell/igerman98/dict/%{name}-%{version}.tar.bz2 -Source1: Nwordlist.tgz Source2: fix8bit.c Source3: austrian.el Source4: german.el Source5: swiss.el Patch0: %{name}-ispell-sort.patch -BuildRequires: aspell BuildRequires: ispell %description -A meta package for German, Swiss, and Austrian dictionaries for the ispell, -aspell and myspell spell checkers. +A meta package for German, Swiss, and Austrian dictionaries for the ispell +and myspell spell checkers. %package doc Summary: Documentation for German dictionaries @@ -50,18 +46,8 @@ BuildArch: noarch %description doc -Documentation for German, Swiss, and Austrian dictionaries for the ispell, -aspell and myspell spell checkers. - -%package -n aspell-de -Summary: A German Dictionary for ASpell -License: GPL-2.0+ -Group: Productivity/Text/Spell -Requires: aspell >= 0.60 -Provides: locale(aspell:de) - -%description -n aspell-de -A German dictionary for the ASpell spell checker. +Documentation for German, Swiss, and Austrian dictionaries for the ispell +and myspell spell checkers. %package -n ispell-ngerman Summary: New German ispell dictionary @@ -104,7 +90,7 @@ package ispell. %prep -%setup -q -a1 +%setup -q %patch0 -p1 %build @@ -117,27 +103,13 @@ for l in DE AT CH; do make %{?_smp_mflags} ispell/de_$l.{aff,hash} - make %{?_smp_mflags} aspell/de_$l.rws done make %{?_smp_mflags} ligature/rmligs -# aspell -- creating extra dictionary with Novell jargon -%{_bindir}/word-list-compress c < Nwordlist > Nwordlist.cwl -%{_bindir}/word-list-compress d < Nwordlist.cwl | aspell --lang=de_DE --local-data-dir=./aspell/ create master ./deNovellwords -for i in aspell/*.multi; do echo "add deNovellwords" >> $i; done - %install mkdir -p %{buildroot}%{_docdir}/%{name} -# aspell -mkdir -p %{buildroot}%{aspell_dict_dir} -install -m 644 aspell/*.{rws,dat,alias,multi} %{buildroot}%{aspell_dict_dir} -install -m 644 ./deNovellwords %{buildroot}%{aspell_dict_dir} -echo "add de_DE.multi" > %{buildroot}%{aspell_dict_dir}/deutsch.alias -echo "add de_DE.multi" > %{buildroot}%{aspell_dict_dir}/german.alias -echo "add de_CH.multi" > %{buildroot}%{aspell_dict_dir}/swiss.alias - # ispell mkdir -p %{buildroot}%{ispell_dict_dir} install -m 644 ispell/de_??.{aff,hash} %{buildroot}%{ispell_dict_dir} @@ -156,13 +128,6 @@ %files doc %doc Documentation/* -%files -n aspell-de -%{aspell_dict_dir}/*.rws -%{aspell_dict_dir}/*.multi -%{aspell_dict_dir}/*.alias -%{aspell_dict_dir}/*.dat -%{aspell_dict_dir}/deNovellwords - %files -n ispell-ngerman %{ispell_dict_dir}/de_DE.aff %{ispell_dict_dir}/de_DE.hash

1 0

commit mariadb for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2017-11-30 12:44:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb" Thu Nov 30 12:44:11 2017 rev:61 rq:546442 version:10.2.10 Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2017-10-28 14:20:28.962188004 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2017-11-30 12:44:15.516389656 +0100 @@ -1,0 +2,145 @@ +Wed Nov 29 12:54:23 UTC 2017 - vcizek(a)suse.com + +- Disable openssl compatibility checking + * the check uses CRYPTO_set_mem_functions() to set debugging + memory allocation function. The setting only succeeds if no allocation + was done before. Our fips self-tests, which are run from the library + constructor, however, do allocate memory, so the subsequent call to + CRYPTO_set_mem_functions causes the compatibility check to fail + * add mariadb-10.2.10-disable_openssl_compatibility_check.patch + +------------------------------------------------------------------- +Tue Oct 31 14:23:22 UTC 2017 - kstreitova(a)suse.com + +- update to 10.2.10 GA + * release notes and changelogs + https://downloads.mariadb.org/mariadb/+releases/ + * fixes for the following security vulnerabilities + * 10.2.10: CVE-2017-10378, CVE-2017-10268 + * 10.2.8: CVE-2017-3636, CVE-2017-3641, CVE-2017-3653, + CVE-2017-10320, CVE-2017-10365, CVE-2017-10379, + CVE-2017-10384, CVE-2017-10286, CVE-2017-3257 + * 10.2.6: CVE-2017-3308, CVE-2017-3309, CVE-2017-3453, + CVE-2017-3456, CVE-2017-3464 + * 10.2.5: CVE-2017-3313, CVE-2017-3302 + * [bsc#1042632], [bsc#1043328], [bsc#1019948], [fate#323738] +- refresh and rename the following patches: + * mariadb-10.1.4-group.patch to + mariadb-10.2.3-group.patch + * mariadb-10.1.16-systemd-cmake.patch to + mariadb-10.2.8-systemd-cmake.patch + * mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch to + mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch + * mariadb-10.1.12-fortify-and-O.patch to + mariadb-10.2.4-fortify-and-O.patch + * mysql-community-server-5.1.46-logrotate.patch to + mariadb-10.2.4-logrotate.patch +- add mariadb-10.2.10.tar.gz.sig signature and mariadb.keyring files +- start building without client library part, use + mariadb-connector-c for getting libmariadb libraries. Remove + libmysclient* packages +- remove baselibs.conf because we no longer build client libraries + here +- update %{soname} to 19 (libmysqld soname) +- change '=' to '>=' in Requires:mariadb-errormessages for + libmysqld%{soname}. Versioned libraries shouldn't require regular + packages with '='. It also causes problems during update (Problem: + libmysqld18-10.1.25-3.1.x86_64 requires mariadb-errormessages = 10.1.25, + but this requirement cannot be provided). + Also add "Provides: mariadb-errormessages = 10.1.25" for errormessages + subpackage that solves this problem for the current update. +- pack new files, remove mysql specific files +- remove README.SUSE as it was outdated +- package cleaning + * run spec-cleaner + * renumber sources + * reorganize subpackages order and update summaries, descriptions + and groups + * tweak and add some comments to the specfile + * remove warning about mysql-packaging repository that is no longer + used for this package + * remove checks whether we build mysql or mariadb (we build mariadb + only) +- add galera subpackage + * add missing "Requires:" (lsof, net-tools, rsync, socat, + xtrabackup) for proper wsrep scripts functionality + * add mariadb-10.2.9-galera_cnf.patch that enhances galera.cnf + configuration file (add wsrep_on=OFF and set the location + of the wsrep library) + * rename README-wsrep to README.wsrep so it corresponds with the + other README names + * move galera_new_cluster, galera_recovery, + use_galera_new_cluster.conf, wsrep_* scripts to the galera + subpackage +- remove the following macros definitions: + * %{_tmpfilesdir} - it's been defined in systemd macros since + openSUSE 13.2 + * %{preferred} - we no longer need to distinguish between preferred + and not preferred version (we build mariadb only) + * %{with_mandatory_lz4} - mysql specific + * %{build_extras}, %{pretty_name}, %{build_readline}, + %{builtin_plugins} and {libname} - they are no longer needed +- add the following macros + * %{run_testsuite} macro that controls the run of the regression + testsuite + * %{ignore_testsuite_result} macro - when set to 1 it ignores + results from the regression testsuite (debug purposes) + * %{with_mroonga} macro (enable mroonga build for x86_64 archs only) +- rename %{with_jemalloc} to %{with_tokudb} and enable tokudb for + x86_64 architectures for openSUSE and SLE15 [fate#323280]. Don't + enable it for SLE12 (missing jemalloc dependency) +- add the following BuildRequires: + * unixODBC-devel to allow ODBC support for Connect engine [bsc#1039034] + * krb5-devel to build auth_gssapi.so plugin + * libarchive-devel + * use libboost_headers-devel instead of boost-devel for TW. Boost + package has been split up and will migrate to using multibuild. + This results in packages that unnecessarily build require + boost-devel to cause major bottlenecks [bsc#1062583] +- do not use "BuildRequires: lzo-devel" for i586 and arm because + it makes build fail +- add the following Requires: + * hostname - as mariadb_install_db depends on this tool [bsc#1060110] + * libaio-devel for libmysqld-devel because libmysqld depends + on libaio +- tweak build options: + * remove "DWITH_ASAN=OFF" - this option was added because of mysql + and it's no longer needed + * switch from "-DWITH_JEMALLOC=auto" to "-DWITH_JEMALLOC=system" + * use "DCMAKE_SKIP_INSTALL_RPATH" - this allows to link with -rpath + during build and fixes quite a few test suite failures. When + installing the file -rpath is still disabled, so this should + not have any effect on the installed binaries + * add "-DWITH_LIBARCHIVE=ON" and "-DWITH_MARIABACKUP=ON" + * remove -DWITH_BOOST=../boost/ as we use system boost now +- enable OQGRAPH to build (openSUSE only, SLE is missing Judy + requirement) +- disable Cassandra storage engine build as it's no longer actively + being developed (See MDEV-4695) [bsc#1055165] + * Remove "BuildRequires: libthrift-devel" and %{with_cassandra} + macros that are no longer needed now +- disable make test (Connector/C unit tests) as it requires a + running server. These tests are part of mysql-test-run + now (MDEV-12470) +- add suse_skipped_tests.list - the list of the tests that we want + to skip (they fail correctly or the fix is in progress) + * adjust mysql-test-run options to skip tests listed there + [bsc#1041891] +- remove mytop utility that is packaged separately +- remove *.jar files from mysql-test +- remove python scripts remains from tokudb upstream +- remove generating of the MySQL NDB Cluster filelists +- remove removing of manpages for MySQL Carrier Grade Edition +- provide a symlink for the my_safe_process executable that was + moved from its location to bindir +- update filename in /var/adm/update-messages to match + documentation and build-compare pattern +- README is now README.md +- fix "file listed twice" build error + +------------------------------------------------------------------- +Tue Oct 31 10:38:13 UTC 2017 - vcizek(a)suse.com + +- Also Require: libopenssl-1_0_0-devel from the libmysqlclient-devel package + +------------------------------------------------------------------- Old: ---- README.SUSE baselibs.conf mariadb-10.1.25.tar.gz New: ---- mariadb-10.2.10.tar.gz mariadb-10.2.10.tar.gz.sig mariadb.keyring suse_skipped_tests.list ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ ++++ 963 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mariadb/mariadb.spec ++++ and /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.spec ++++++ configuration-tweaks.tar.xz ++++++ ++++++ mariadb-10.1.25.tar.gz -> mariadb-10.2.10.tar.gz ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-10.1.25.tar.gz /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-10.2.10.tar.gz differ: char 5, line 1 ++++++ mariadb.keyring ++++++ pub 1024D/1BB943DB 2010-02-02 uid [ unknown] MariaDB Package Signing Key <package-signing-key(a)mariadb.org> uid [ unknown] Daniel Bartholomew (Monty Program signing key) <dbart(a)askmonty.org> sub 4096g/672557E6 2010-02-02 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2 mQGiBEtohJARBACxvZpWSIMTp/e7BUzSW+WDL7Pl0JDg6v7ZJFGJk9qo+5JXIiis 497Ul0FmVJ6EoyVzfpqe5FyUvqtLCkM6UP5adyvXTHi1KMiYacu2q5yRhDpMKbpM LkAg23Yyz1yK/d0TsAkerLJ6K1Bh8NIm44Op+qFrDxeYZDIR5Q8WaCdK8wCg/jc8 p/4XaKq74ghUHEX+35qk63UD/0YEsgHrsRQZ42wKNeO8ZUJKqCVHXYJrCq7DhRhn U5aYnuK3op0JusPN5fdIGkKwJy24dWRoRfNIIg0WvM8qUNrC2NvhomnZNudsI0Jb XapRemrIwbvrZToD6ei1awdVqa5fT6XIxV4MSQEwn47qmUNSz/0TkUmB3VZ2EL/j zfHUA/91ZfAdWCmRemTLWRrzIYYJKyEInZ0qwZVrkyMY8+T7b2/6RGR0f2oV1dOx cjbd0+N3vKrUkjuzkcVu/oB8wq9UBfuSHwsxYqub4gvIh0/LW+CsWa955sQ/Hj9H 48j3nUHaXqM9uJyMMgMlCdo3rLpnYCJH8w2kFfLHIDksMs1YtLQ9TWFyaWFEQiBQ YWNrYWdlIFNpZ25pbmcgS2V5IDxwYWNrYWdlLXNpZ25pbmcta2V5QG1hcmlhZGIu b3JnPohiBBMRAgAiBQJREUepAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK CRDLywgqG7lD28y4AJ0aByfYvJWqBm5PZjusZiG0vo9SRwCeM0izj/oryMu0fJi3 kRbTlojzCd20Q0RhbmllbCBCYXJ0aG9sb21ldyAoTW9udHkgUHJvZ3JhbSBzaWdu aW5nIGtleSkgPGRiYXJ0QGFza21vbnR5Lm9yZz6IYAQTEQIAIAUCS2iEkAIbAwYL CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMvLCCobuUPboDgAoNQVrK4i5LXTgwnW ke2MxsXCoHDnAJ93j733YuNkV64aHEUwWxNCkkwUkbkEDQRLaIS4EBAApZ0wvxpQ VlZ6OEFa9SBQ5eclRIOjXjKqkYGkvIx+jUmqCYfOgfPixOGYS5Q2KwHNz4XEOIOA 1kyClAoAAgOEGUxj8CxnbBk10IVo/JBONjdqKYPZ2YNdeIIrKXEmai4i5hK5AfZH oyqsV5aqxGkGeVUju/coyRJY6La8iL+RBuxiRuUPWymGjtISAR6fSiN8f/kRly/y 9LmMO8JcOpeieqLUFPK6KuzhI4F0nFkHJpZPDNOHHl+GmAZ+SqZxmIrpkGymd36h TKxW4nlnN6kqc1gMwdn1L/u/D+C/jhMbTTssqiMZeyP9uFmnMB3ls1NV8OxvbxcT BG0M7g4AlffUQKpUrNhIBoC3R7UbYQ3CTZX1Qp/TBzbfRAgGhdWBQDQEd3/Ll9G4 QaCs9I+4W68rkAr7e7IylHyfEi9oYQkXFIEeaAhiENmJBpcLpas/yNJoLayqzPsQ +lRNg3omFntPtZolkMi6orRNixrgXV64m/01YNjmBFTqsp5wOq2j0cmTkbOWqdnl mGPg2El1ufebJc6YWS1nFm6YRpN/B3QbtAnar1Cb+IHlr0haTOYhQp+XFN+k1brq s+Sufa8/rz6N5tsm+W5GjHKvHr24FTa02u3H4lIqNlNBkzZZKhzAhxEWiJzwc/f2 upG5vdplrM/YCU+XTotYPb5ZEXQe2mD/rXMAAwUP/0f1DOJIfnMrh1o/3RKqDq8k 7tlv2GEEv0VEnh8ty4dMb8Dos2M1Oc4Kv9QLB3DXcS4/L4JW5vF0QgSAzq1r5oBT 1zaMcqDS6OUlHrWUi8aDNt5EPQuEGdP2/iTDeAq4r8eCYrHRC7egldyRZrmWNfcZ N6/G9K+JSjhWfSWWSBRIqb+UxcQNCp6i6tvVSxCfLK1R4P4kA/Z4Co2vywIfVfPh Hd5nIWNl1yl9O3r04GCNTjzwsv/dhUGDFIVsghgehZuL0Bb7hDuyvZ2ShALumZ5t 7mU/SJ2hOk3klO+2bIJB0gquUkWn/4g1h2Tp9XVWrI1x6GUBxRYkwC4tWajzWeVC 5hcDVAdqYN0H0HVj/CEgrEWlCVv1hJ0JYAsjX8Cj1QuZB1i34fjEkgybMjo3oCU5 GCSiNmvtTeUpexyY/7iHAdyoZHFT+fQS84VMYKFT4tTYH+5jTa62yfPhn63TYPor rRyTqG8aJQLnczm0NN5R5mriYJQjr4Pj8PSSwWck/Gt8R5vb+C69+uXINB6OKqhG 6xU0bqnCIxt3OhVS7v0SfHjn0+il/JOc/ev9wm6G5FxmEWOoYwibmaDzHfc9N1HM RzjTENI7fyJPNFj9IDkpwk4E3ylrkuVl2KEmYDJ9T9ny4UMnQ7Sb6w59UhxMIFtR TPNpQJWCWXfhWUAo4WfCiEkEGBECAAkFAktohLgCGwwACgkQy8sIKhu5Q9vThgCg 7R7ImT+21phcbxVYBQZjiJVY/2YAnRKPeNKPNIviaUUV7kxMXt949GQX =zBws -----END PGP PUBLIC KEY BLOCK----- ++++++ mysql-patches.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.1.12-fortify-and-O.patch new/mysql-patches/mysql-patches/mariadb-10.1.12-fortify-and-O.patch --- old/mysql-patches/mysql-patches/mariadb-10.1.12-fortify-and-O.patch 2017-07-10 12:30:40.552003757 +0200 +++ new/mysql-patches/mysql-patches/mariadb-10.1.12-fortify-and-O.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -PATCH-P0-FIX-HACK: Not enforcing specific flags - -Useing some CFLAGS from distribution and some enforced can and leads to the -conflicts like FORTIFY and -O0. Removing hardcoded options. - -Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> - -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -220,7 +220,6 @@ IF(SECURITY_HARDENED) - MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") - MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") - MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") -- MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) - ENDIF() - - # Always enable debug sync for debug builds. -Index: storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -=================================================================== ---- storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake.orig -+++ storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -@@ -26,11 +26,9 @@ endif () - if (CMAKE_VERSION VERSION_LESS 3.0) - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) -- set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD _FORTIFY_SOURCE=2) - else () - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS - $<$<OR:$<CONFIG:DEBUG>,$<CONFIG:DRD>>:TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1> -- $<$<CONFIG:DRD>:_FORTIFY_SOURCE=2> - ) - endif () - -@@ -102,23 +100,23 @@ set_cflags_if_supported( - ) - - ## set extra debugging flags and preprocessor definitions --set(CMAKE_C_FLAGS_DEBUG "-g3 -O0 ${CMAKE_C_FLAGS_DEBUG}") --set(CMAKE_CXX_FLAGS_DEBUG "-g3 -O0 ${CMAKE_CXX_FLAGS_DEBUG}") -+set(CMAKE_C_FLAGS_DEBUG "-g3 ${CMAKE_C_FLAGS_DEBUG}") -+set(CMAKE_CXX_FLAGS_DEBUG "-g3 ${CMAKE_CXX_FLAGS_DEBUG}") - - ## flags to use when we want to run DRD on the resulting binaries - ## DRD needs debugging symbols. - ## -O0 makes it too slow, and -O2 inlines too much for our suppressions to work. -O1 is just right. --set(CMAKE_C_FLAGS_DRD "-g3 -O1 ${CMAKE_C_FLAGS_DRD}") --set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE_CXX_FLAGS_DRD}") -+set(CMAKE_C_FLAGS_DRD "-g3 ${CMAKE_C_FLAGS_DRD}") -+set(CMAKE_CXX_FLAGS_DRD "-g3 ${CMAKE_CXX_FLAGS_DRD}") - - ## set extra release flags - ## need to set flags for RelWithDebInfo as well because we want the MySQL/MariaDB builds to use them - if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) - # have tried -flto and -O4, both make our statically linked executables break apple's linker -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_C_FLAGS_RELEASE "-g -O3 ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-g ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-g ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") - else () - if (APPLE) - set(FLTO_OPTS "-fwhole-program") -@@ -126,10 +124,10 @@ else () - set(FLTO_OPTS "-fuse-linker-plugin") - endif() - # we overwrite this because the default passes -DNDEBUG and we don't want that -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_C_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") - set(CMAKE_EXE_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_EXE_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_SHARED_LINKER_FLAGS}") - endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.1.16-systemd-cmake.patch new/mysql-patches/mysql-patches/mariadb-10.1.16-systemd-cmake.patch --- old/mysql-patches/mysql-patches/mariadb-10.1.16-systemd-cmake.patch 2017-03-15 18:14:43.247637250 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.1.16-systemd-cmake.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -PATCH-P1-FIX-HACK: Allow more case-insensitive values for 'WITH_SYSTEMD' - -Remove 'IF(WITH_SYSTEMD STREQUAL "yes")' and use 'IF(WITH_SYSTEMD)' -expression in order to allow more case-insensitive values to be used -here (1, ON, YES, TRUE or Y). - -Maintainer: Kristyna Streitova <kstreitova(a)suse.cz> - -Index: mariadb-10.1.22/cmake/systemd.cmake -=================================================================== ---- mariadb-10.1.22.orig/cmake/systemd.cmake -+++ mariadb-10.1.22/cmake/systemd.cmake -@@ -19,9 +19,9 @@ INCLUDE(FindPkgConfig) - MACRO(CHECK_SYSTEMD) - IF(UNIX) - SET(WITH_SYSTEMD "auto" CACHE STRING "Enable systemd scripts and notification support") -- IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto") -+ IF(WITH_SYSTEMD OR WITH_SYSTEMD STREQUAL "auto") - IF(PKG_CONFIG_FOUND) -- IF(WITH_SYSTEMD STREQUAL "yes") -+ IF(WITH_SYSTEMD) - pkg_search_module(LIBSYSTEMD REQUIRED libsystemd libsystemd-daemon) - ELSE() - pkg_search_module(LIBSYSTEMD libsystemd libsystemd-daemon) -@@ -75,7 +75,7 @@ MACRO(CHECK_SYSTEMD) - UNSET(HAVE_SYSTEMD_SD_NOTIFY) - UNSET(HAVE_SYSTEMD_SD_NOTIFYF) - MESSAGE(STATUS "Systemd features not enabled") -- IF(WITH_SYSTEMD STREQUAL "yes") -+ IF(WITH_SYSTEMD) - MESSAGE(FATAL_ERROR "Requested WITH_SYSTEMD=YES however no dependencies installed/found") - ENDIF() - ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch new/mysql-patches/mysql-patches/mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch --- old/mysql-patches/mysql-patches/mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch 2016-11-03 14:56:24.808532600 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -PATCH-P1-FIX-UPSTREAM: Fix mysql_install_db to find data files in mariadb directories - -Fix mysql_install_db.sh script to find data files in mariadb directories -when a user uses "--basedir" option [bsc#1006539] - -Maintainer: Kristyna Streitova <kstreitova(a)suse.com> - -Index: mariadb-10.1.18/scripts/mysql_install_db.sh -=================================================================== ---- mariadb-10.1.18.orig/scripts/mysql_install_db.sh -+++ mariadb-10.1.18/scripts/mysql_install_db.sh -@@ -289,17 +289,17 @@ then - cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin - exit 1 - fi -- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english` -+ langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english share/mariadb/english` - if test -z "$langdir" - then -- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english -+ cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english $basedir/share/mariadb/english - exit 1 - fi -- srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` -+ srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mariadb` - buildpkgdatadir=$srcpkgdatadir - if test -z "$srcpkgdatadir" - then -- cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql -+ cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql $basedir/share/mariadb - exit 1 - fi - scriptdir="$basedir/scripts" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.1.4-group.patch new/mysql-patches/mysql-patches/mariadb-10.1.4-group.patch --- old/mysql-patches/mysql-patches/mariadb-10.1.4-group.patch 2017-02-03 15:48:33.836935430 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.1.4-group.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,137 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Adds group option - -This patch let's you specify not only user to use but also group that MySQL -should use. - -Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> - -Index: scripts/mysqld_safe.sh -=================================================================== ---- scripts/mysqld_safe.sh.orig -+++ scripts/mysqld_safe.sh -@@ -29,6 +29,7 @@ logging=init - want_syslog=0 - syslog_tag= - user='@MYSQLD_USER@' -+group='@MYSQLD_GROUP@' - pid_file= - err_log= - err_log_base= -@@ -308,6 +309,7 @@ parse_arguments() { - --pid[-_]file=*) pid_file="$val" ;; - --plugin[-_]dir=*) PLUGIN_DIR="$val" ;; - --user=*) user="$val"; SET_USER=1 ;; -+ --group=*) group="$val"; SET_USER=1 ;; - --log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*) - pid_file="$val.pid"; - err_log_base="$val"; -@@ -737,6 +739,7 @@ then - if test "$user" != "root" -o $SET_USER = 1 - then - USER_OPTION="--user=$user" -+ GROUP_OPTION="--group=$group" - fi - if test -n "$open_files" - then -@@ -759,7 +762,12 @@ then - log_error "Fatal error Can't create database directory '$mysql_unix_port'" - exit 1 - fi -- chown $user $mysql_unix_port_dir -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $mysql_unix_port_dir -+ else -+ [ "$user" ] && chown $user $mysql_unix_port_dir -+ [ "$group" ] && chgrp $group $mysql_unix_port_dir -+ fi - chmod 755 $mysql_unix_port_dir - fi - -Index: scripts/mysql_install_db.sh -=================================================================== ---- scripts/mysql_install_db.sh.orig -+++ scripts/mysql_install_db.sh -@@ -29,6 +29,7 @@ args="" - defaults="" - mysqld_opt="" - user="" -+group="" - - force=0 - in_rpm=0 -@@ -88,6 +89,11 @@ Usage: $0 [OPTIONS] - user. You must be root to use this option. By default - mysqld runs using your current login name and files and - directories that it creates will be owned by you. -+ --group=group_name The login group to use for running mysqld. Files and -+ directories created by mysqld will be owned by this -+ group. You must be root to use this option. By default -+ mysqld runs using your current group and files and -+ directories that it creates will be owned by you. - - All other options are passed to the mysqld program - -@@ -135,11 +141,11 @@ parse_arguments() - --builddir=*) builddir=`parse_arg "$arg"` ;; - --srcdir=*) srcdir=`parse_arg "$arg"` ;; - --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; -- --user=*) - # Note that the user will be passed to mysqld so that it runs - # as 'user' (crucial e.g. if log-bin=/some_other_path/ - # where a chown of datadir won't help) -- user=`parse_arg "$arg"` ;; -+ --user=*) user=`parse_arg "$arg"` ;; -+ --group=*) group=`parse_arg "$arg"` ;; - --skip-name-resolve) ip_only=1 ;; - --verbose) verbose=1 ;; # Obsolete - --rpm) in_rpm=1 ;; -@@ -420,7 +426,12 @@ do - fi - if test -n "$user" - then -- chown $user "$dir" -+ if test -z "$group" -+ then -+ chown $user $dir -+ else -+ chown $user:$group $dir -+ fi - if test $? -ne 0 - then - echo "Cannot change ownership of the database directories to the '$user'" -@@ -435,6 +446,11 @@ then - args="$args --user=$user" - fi - -+if test -n "$group" -+then -+ args="$args --group=$group" -+fi -+ - # When doing a "cross bootstrap" install, no reference to the current - # host should be added to the system tables. So we filter out any - # lines which contain the current host name. -Index: scripts/CMakeLists.txt -=================================================================== ---- scripts/CMakeLists.txt.orig -+++ scripts/CMakeLists.txt -@@ -134,6 +134,7 @@ ENDIF() - - SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") -+SET(MYSQLD_GROUP "mysql") - - # Required for mysqlbug until autotools are deprecated, once done remove these - # and expand default cmake variables -Index: support-files/CMakeLists.txt -=================================================================== ---- support-files/CMakeLists.txt.orig -+++ support-files/CMakeLists.txt -@@ -29,6 +29,7 @@ ELSE() - SET(CFLAGS ${CMAKE_C_FLAGS}) - SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) - SET(MYSQLD_USER "mysql") -+ SET(MYSQLD_GROUP "mysql") - SET(ini_file_extension "cnf") - SET(HOSTNAME "hostname") - ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.10-disable_openssl_compatibility_check.patch new/mysql-patches/mysql-patches/mariadb-10.2.10-disable_openssl_compatibility_check.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.10-disable_openssl_compatibility_check.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.10-disable_openssl_compatibility_check.patch 2017-11-29 14:08:42.265670469 +0100 @@ -0,0 +1,42 @@ +PATCH-P1-SUSE: Fix running with our patched openssl + +- Disable openssl compatibility checking + * the check uses CRYPTO_set_mem_functions() to set debugging + memory allocation function. The setting only succeeds if no allocation + was done before. Our fips self-tests, which are run from the library + constructor, however, do allocate memory, so the subsequent call to + CRYPTO_set_mem_functions causes the compatibility check to fail + +Maintainer: Vitezslav Cizek <vcizek(a)suse.com> + +Index: mariadb-10.2.10/mysys_ssl/openssl.c +=================================================================== +--- mariadb-10.2.10.orig/mysys_ssl/openssl.c 2017-10-30 09:10:45.000000000 +0100 ++++ mariadb-10.2.10/mysys_ssl/openssl.c 2017-11-29 13:43:20.022236791 +0100 +@@ -47,26 +47,6 @@ static void *coc_malloc(size_t size, con + + int check_openssl_compatibility() + { +- EVP_CIPHER_CTX *evp_ctx; +- EVP_MD_CTX *md5_ctx; +- +- if (!CRYPTO_set_mem_functions(coc_malloc, NULL, NULL)) +- return 1; +- +- testing= 1; +- alloc_size= alloc_count= 0; +- evp_ctx= EVP_CIPHER_CTX_new(); +- EVP_CIPHER_CTX_free(evp_ctx); +- if (alloc_count != 1 || !alloc_size || alloc_size > EVP_CIPHER_CTX_SIZE) +- return 1; +- +- alloc_size= alloc_count= 0; +- md5_ctx= EVP_MD_CTX_create(); +- EVP_MD_CTX_destroy(md5_ctx); +- if (alloc_count != 1 || !alloc_size || alloc_size > EVP_MD_CTX_SIZE) +- return 1; +- +- testing= 0; + return 0; + } + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.3-group.patch new/mysql-patches/mysql-patches/mariadb-10.2.3-group.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.3-group.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.3-group.patch 2017-03-15 19:27:49.000000000 +0100 @@ -0,0 +1,137 @@ +PATCH-P0-FEATURE-UPSTREAM: Adds group option + +This patch let's you specify not only user to use but also group that MySQL +should use. + +Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> + +Index: scripts/mysqld_safe.sh +=================================================================== +--- scripts/mysqld_safe.sh.orig ++++ scripts/mysqld_safe.sh +@@ -28,6 +28,7 @@ logging=init + want_syslog=0 + syslog_tag= + user='@MYSQLD_USER@' ++group='@MYSQLD_GROUP@' + pid_file= + err_log= + err_log_base= +@@ -300,6 +301,7 @@ parse_arguments() { + --pid[-_]file=*) pid_file="$val" ;; + --plugin[-_]dir=*) PLUGIN_DIR="$val" ;; + --user=*) user="$val"; SET_USER=1 ;; ++ --group=*) group="$val"; SET_USER=1 ;; + --log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*) + pid_file="$val.pid"; + err_log_base="$val"; +@@ -713,6 +715,7 @@ then + if test "$user" != "root" -o $SET_USER = 1 + then + USER_OPTION="--user=$user" ++ GROUP_OPTION="--group=$group" + fi + if test -n "$open_files" + then +@@ -735,7 +738,12 @@ then + log_error "Fatal error Can't create database directory '$mysql_unix_port'" + exit 1 + fi +- chown $user $mysql_unix_port_dir ++ if [ "$user" -a "$group" ]; then ++ chown $user:$group $mysql_unix_port_dir ++ else ++ [ "$user" ] && chown $user $mysql_unix_port_dir ++ [ "$group" ] && chgrp $group $mysql_unix_port_dir ++ fi + chmod 755 $mysql_unix_port_dir + fi + +Index: scripts/mysql_install_db.sh +=================================================================== +--- scripts/mysql_install_db.sh.orig ++++ scripts/mysql_install_db.sh +@@ -29,6 +29,7 @@ args="" + defaults="" + mysqld_opt="" + user="" ++group="" + silent_startup="--silent-startup" + + force=0 +@@ -89,6 +90,11 @@ Usage: $0 [OPTIONS] + user. You must be root to use this option. By default + mysqld runs using your current login name and files and + directories that it creates will be owned by you. ++ --group=group_name The login group to use for running mysqld. Files and ++ directories created by mysqld will be owned by this ++ group. You must be root to use this option. By default ++ mysqld runs using your current group and files and ++ directories that it creates will be owned by you. + + All other options are passed to the mysqld program + +@@ -136,11 +142,11 @@ parse_arguments() + --builddir=*) builddir=`parse_arg "$arg"` ;; + --srcdir=*) srcdir=`parse_arg "$arg"` ;; + --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; +- --user=*) + # Note that the user will be passed to mysqld so that it runs + # as 'user' (crucial e.g. if log-bin=/some_other_path/ + # where a chown of datadir won't help) +- user=`parse_arg "$arg"` ;; ++ --user=*) user=`parse_arg "$arg"` ;; ++ --group=*) group=`parse_arg "$arg"` ;; + --skip-name-resolve) ip_only=1 ;; + --verbose) verbose=1 ; silent_startup="" ;; + --rpm) in_rpm=1 ;; +@@ -421,7 +427,12 @@ do + fi + if test -n "$user" + then +- chown $user "$dir" ++ if test -z "$group" ++ then ++ chown $user $dir ++ else ++ chown $user:$group $dir ++ fi + if test $? -ne 0 + then + echo "Cannot change ownership of the database directories to the '$user'" +@@ -436,6 +447,11 @@ then + args="$args --user=$user" + fi + ++if test -n "$group" ++then ++ args="$args --group=$group" ++fi ++ + # When doing a "cross bootstrap" install, no reference to the current + # host should be added to the system tables. So we filter out any + # lines which contain the current host name. +Index: scripts/CMakeLists.txt +=================================================================== +--- scripts/CMakeLists.txt.orig ++++ scripts/CMakeLists.txt +@@ -134,6 +134,7 @@ ENDIF() + + SET(HOSTNAME "hostname") + SET(MYSQLD_USER "mysql") ++SET(MYSQLD_GROUP "mysql") + ENDIF(UNIX) + + # Really ugly, one script, "mysql_install_db", needs prefix set to ".", +Index: support-files/CMakeLists.txt +=================================================================== +--- support-files/CMakeLists.txt.orig ++++ support-files/CMakeLists.txt +@@ -29,6 +29,7 @@ ELSE() + SET(CFLAGS ${CMAKE_C_FLAGS}) + SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) + SET(MYSQLD_USER "mysql") ++ SET(MYSQLD_GROUP "mysql") + SET(ini_file_extension "cnf") + SET(HOSTNAME "hostname") + ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch new/mysql-patches/mysql-patches/mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch 2017-11-01 18:12:53.000000000 +0100 @@ -0,0 +1,22 @@ +PATCH-P1-FIX-UPSTREAM: Fix mysql_install_db to find data files in mariadb directories + +Fix mysql_install_db.sh script to find data files in mariadb directories +when a user uses "--basedir" option [bsc#1006539] + +Maintainer: Kristyna Streitova <kstreitova(a)suse.com> + +Index: mariadb-10.2.10/scripts/CMakeLists.txt +=================================================================== +--- mariadb-10.2.10.orig/scripts/CMakeLists.txt ++++ mariadb-10.2.10/scripts/CMakeLists.txt +@@ -188,8 +188,8 @@ ENDIF() + + SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin") + SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin") +-SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english") +-SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql") ++SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english $basedir/share/mariadb/english") ++SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql $basedir/share/mariadb") + + IF(UNIX) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.4-fortify-and-O.patch new/mysql-patches/mysql-patches/mariadb-10.2.4-fortify-and-O.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.4-fortify-and-O.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.4-fortify-and-O.patch 2017-07-28 15:06:34.000000000 +0200 @@ -0,0 +1,82 @@ +PATCH-P0-FIX-HACK: Not enforcing specific flags + +Useing some CFLAGS from distribution and some enforced can and leads to the +conflicts like FORTIFY and -O0. Removing hardcoded options. + +Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> + +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -217,7 +217,6 @@ IF(SECURITY_HARDENED) + MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") + MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") + MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") +- MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) + ENDIF() + + # Always enable debug sync for debug builds. +Index: storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +=================================================================== +--- storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake.orig ++++ storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +@@ -26,11 +26,9 @@ endif () + if (CMAKE_VERSION VERSION_LESS 3.0) + set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) + set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) +- set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD _FORTIFY_SOURCE=2) + else () + set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS + $<$<OR:$<CONFIG:DEBUG>,$<CONFIG:DRD>>:TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1> +- $<$<CONFIG:DRD>:_FORTIFY_SOURCE=2> + ) + endif () + +@@ -102,23 +100,23 @@ set_cflags_if_supported( + ) + + ## set extra debugging flags and preprocessor definitions +-set(CMAKE_C_FLAGS_DEBUG "-g3 -O0 ${CMAKE_C_FLAGS_DEBUG}") +-set(CMAKE_CXX_FLAGS_DEBUG "-g3 -O0 ${CMAKE_CXX_FLAGS_DEBUG}") ++set(CMAKE_C_FLAGS_DEBUG "-g3 ${CMAKE_C_FLAGS_DEBUG}") ++set(CMAKE_CXX_FLAGS_DEBUG "-g3 ${CMAKE_CXX_FLAGS_DEBUG}") + + ## flags to use when we want to run DRD on the resulting binaries + ## DRD needs debugging symbols. + ## -O0 makes it too slow, and -O2 inlines too much for our suppressions to work. -O1 is just right. +-set(CMAKE_C_FLAGS_DRD "-g3 -O1 ${CMAKE_C_FLAGS_DRD}") +-set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE_CXX_FLAGS_DRD}") ++set(CMAKE_C_FLAGS_DRD "-g3 ${CMAKE_C_FLAGS_DRD}") ++set(CMAKE_CXX_FLAGS_DRD "-g3 ${CMAKE_CXX_FLAGS_DRD}") + + ## set extra release flags + ## need to set flags for RelWithDebInfo as well because we want the MySQL/MariaDB builds to use them + if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) + # have tried -flto and -O4, both make our statically linked executables break apple's linker +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_C_FLAGS_RELEASE "-g -O3 ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELEASE "-g ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELEASE "-g ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") + else () + if (APPLE) + set(FLTO_OPTS "-fwhole-program") +@@ -126,10 +124,10 @@ else () + set(FLTO_OPTS "-fuse-linker-plugin") + endif() + # we overwrite this because the default passes -DNDEBUG and we don't want that +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_C_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") + set(CMAKE_EXE_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_EXE_LINKER_FLAGS}") + set(CMAKE_SHARED_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_SHARED_LINKER_FLAGS}") + endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.4-logrotate.patch new/mysql-patches/mysql-patches/mariadb-10.2.4-logrotate.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.4-logrotate.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.4-logrotate.patch 2017-07-28 15:04:54.000000000 +0200 @@ -0,0 +1,35 @@ +PATCH-P0-FIX-SUSE: Fix log file path for logrotate + +In SUSE we've got MySQL log in different directory. It's located in +/var/log/mysql by default. It also adds some extra error message. + +Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> + +Index: support-files/mysql-log-rotate.sh +=================================================================== +--- support-files/mysql-log-rotate.sh.orig ++++ support-files/mysql-log-rotate.sh +@@ -18,7 +18,7 @@ + # ATTENTION: This /root/.my.cnf should be readable ONLY + # for root ! + +-@localstatedir@/mysqld.log { ++/var/log/mysql/mysqld.log { + # create 600 mysql mysql + notifempty + daily +@@ -32,6 +32,14 @@ + then + @bindir@/mysqladmin --local flush-error-log \ + flush-engine-log flush-general-log flush-slow-log ++ ret=$? ++ if test $ret -ne 0 ++ then ++ echo "/etc/logrotate.d/mariadb failed, probably because" >&2 ++ echo "the root acount is protected by password." >&2 ++ echo "See comments in /etc/logrotate.d/mariadb on how to fix this" >&2 ++ exit $ret ++ fi + fi + endscript + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.8-systemd-cmake.patch new/mysql-patches/mysql-patches/mariadb-10.2.8-systemd-cmake.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.8-systemd-cmake.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.8-systemd-cmake.patch 2017-09-29 15:42:46.000000000 +0200 @@ -0,0 +1,33 @@ +PATCH-P1-FIX-HACK: Allow more case-insensitive values for 'WITH_SYSTEMD' + +Remove 'IF(WITH_SYSTEMD STREQUAL "yes")' and use 'IF(WITH_SYSTEMD)' +expression in order to allow more case-insensitive values to be used +here (1, ON, YES, TRUE or Y). + +Maintainer: Kristyna Streitova <kstreitova(a)suse.cz> + +Index: mariadb-10.2.9/cmake/systemd.cmake +=================================================================== +--- mariadb-10.2.9.orig/cmake/systemd.cmake ++++ mariadb-10.2.9/cmake/systemd.cmake +@@ -18,9 +18,9 @@ MACRO(CHECK_SYSTEMD) + INCLUDE(FindPkgConfig) + # http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html + SET(WITH_SYSTEMD "auto" CACHE STRING "Enable systemd scripts and notification support") +- IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto") ++ IF(WITH_SYSTEMD OR WITH_SYSTEMD STREQUAL "auto") + IF(PKG_CONFIG_FOUND) +- IF(WITH_SYSTEMD STREQUAL "yes") ++ IF(WITH_SYSTEMD) + pkg_search_module(LIBSYSTEMD REQUIRED libsystemd libsystemd-daemon) + ELSE() + pkg_search_module(LIBSYSTEMD libsystemd libsystemd-daemon) +@@ -68,7 +68,7 @@ MACRO(CHECK_SYSTEMD) + UNSET(HAVE_SYSTEMD_SD_NOTIFY) + UNSET(HAVE_SYSTEMD_SD_NOTIFYF) + MESSAGE_ONCE(systemd "Systemd features not enabled") +- IF(WITH_SYSTEMD STREQUAL "yes") ++ IF(WITH_SYSTEMD ) + MESSAGE(FATAL_ERROR "Requested WITH_SYSTEMD=yes however no dependencies installed/found") + ENDIF() + ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.2.9-galera_cnf.patch new/mysql-patches/mysql-patches/mariadb-10.2.9-galera_cnf.patch --- old/mysql-patches/mysql-patches/mariadb-10.2.9-galera_cnf.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.2.9-galera_cnf.patch 2017-09-29 17:29:30.000000000 +0200 @@ -0,0 +1,29 @@ +PATCH-P1-FIX-FEATURE: Enhance wsrep.cnf (galera configuration file) + +wsrep_on option defines whether or not wsrep replication is enabled. +It's set to OFF by default since MariaDB 10.1 but we want to mention +this option explicitly in galera configuration file in order to bring +it to the user's attention. + +Set the location of the wsrep library (wsrep_provider option). + +Maintainer: Kristyna Streitova <kstreitova(a)suse.cz> + + +Index: mariadb-10.2.9/support-files/wsrep.cnf.sh +=================================================================== +--- mariadb-10.2.9.orig/support-files/wsrep.cnf.sh ++++ mariadb-10.2.9/support-files/wsrep.cnf.sh +@@ -30,8 +30,11 @@ bind-address=0.0.0.0 + ## WSREP options + ## + ++# Whether or not wsrep replication is enabled ++wsrep_on=OFF ++ + # Full path to wsrep provider library or 'none' +-wsrep_provider=none ++wsrep_provider=%{_libdir}/galera/libgalera_smm.so + + # Provider specific configuration options + #wsrep_provider_options= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.46-logrotate.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.46-logrotate.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.46-logrotate.patch 2017-03-15 17:03:23.624761794 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.46-logrotate.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -PATCH-P0-FIX-SUSE: Fix log file path for logrotate - -In SUSE we've got MySQL log in different directory. It's located in -/var/log/mysql by default. It also adds some extra error message. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: support-files/mysql-log-rotate.sh -=================================================================== ---- support-files/mysql-log-rotate.sh.orig -+++ support-files/mysql-log-rotate.sh -@@ -18,7 +18,7 @@ - # ATTENTION: This /root/.my.cnf should be readable ONLY - # for root ! - --@localstatedir@/mysqld.log { -+/var/log/mysql/mysqld.log { - # create 600 mysql mysql - notifempty - daily -@@ -32,6 +32,14 @@ - then - @bindir@/mysqladmin --local flush-error-log \ - flush-engine-log flush-general-log flush-slow-log -+ ret=$? -+ if test $ret -ne 0 -+ then -+ echo "/etc/logrotate.d/mariadb failed, probably because" >&2 -+ echo "the root acount is protected by password." >&2 -+ echo "See comments in /etc/logrotate.d/mariadb on how to fix this" >&2 -+ exit $ret -+ fi - fi - endscript - } ++++++ series ++++++ --- /var/tmp/diff_new_pack.sORjoY/_old 2017-11-30 12:44:17.920302262 +0100 +++ /var/tmp/diff_new_pack.sORjoY/_new 2017-11-30 12:44:17.924302117 +0100 @@ -1,12 +1,14 @@ mysql-community-server-5.1.45-multi-configuration.patch -mysql-community-server-5.1.46-logrotate.patch +mariadb-10.2.4-logrotate.patch mariadb-5.5.28-install_db-quiet.patch mariadb-10.1.1-mysqld_multi-features.patch mariadb-5.2.3-cnf.patch mysql-community-server-5.5.6-safe-process-in-bin.patch -mariadb-10.1.4-group.patch +mariadb-10.2.3-group.patch mariadb-10.1.12-deharcode-libdir.patch mariadb-10.0.15-logrotate-su.patch -mariadb-10.1.12-fortify-and-O.patch -mariadb-10.1.16-systemd-cmake.patch -mariadb-10.1.18-mysql_install_db-mariadb_dirs.patch +mariadb-10.2.4-fortify-and-O.patch +mariadb-10.2.8-systemd-cmake.patch +mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch +mariadb-10.2.9-galera_cnf.patch +mariadb-10.2.10-disable_openssl_compatibility_check.patch ++++++ suse_skipped_tests.list ++++++ #---------------------------------------------------------------- # The SSL tests that are failing correctly main.ssl_7937 : bsc#937835, MDEV-8404 main.ssl_crl_clients : bsc#937835, MDEV-8404 main.ssl_cert_verify : bsc#937835, MDEV-8404 main.ssl_8k_key : bsc#937835, MDEV-8404 # Main and perfschema tests main.userstat : bsc#937836, MDEV-8446 perfschema.nesting : bsc#937836, MDEV-8446 perfschema.socket_summary_by_event_name_func : bsc#937836, MDEV-8446 perfschema.socket_summary_by_instance_func : bsc#937836, MDEV-8446 #---------------------------------------------------------------- # Needs to be investigated (issues trackers will be added) plugins.show_all_plugins : perfschema.cnf_option : perfschema.privilege_table_io : rpl.rpl_row_img_blobs : rpl.rpl_row_img_eng_min : rpl.rpl_row_img_eng_noblob : sys_vars.slave_parallel_threads_basic : rocksdb.shutdown : rocksdb.deadlock : roles.acl_statistics : main.non_blocking_api : main.join_cache : main.explain_non_select : main.mdev-504 : (i586) sys_vars.innodb_change_buffer_max_size_basic : (i586)

1 0

commit mysql-connector-cpp for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package mysql-connector-cpp for openSUSE:Factory checked in at 2017-11-30 12:44:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old) and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mysql-connector-cpp" Thu Nov 30 12:44:04 2017 rev:24 rq:545192 version:1.1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes 2017-09-25 13:52:05.480671803 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new/mysql-connector-cpp.changes 2017-11-30 12:44:05.612749703 +0100 @@ -1,0 +2,14 @@ +Fri Nov 24 12:20:13 UTC 2017 - kstreitova(a)suse.com + +- add mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch + to fix build by fixing copypaste errors in + libmysql_dynamic_proxy.cpp file [bsc#1067883] +- remove mariadb_api.patch that it's no longer needed because: + * our current client library already provides mysql_get_option() + * using MARIADB_BASE_VERSION is no longer working as intended as + it's not defined in mariadb client library provided by + mariadb-connector-c + * hunk for stmt_free_result() was moved to + mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch + +------------------------------------------------------------------- Old: ---- mariadb_api.patch New: ---- mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-connector-cpp.spec ++++++ --- /var/tmp/diff_new_pack.i3iVvx/_old 2017-11-30 12:44:06.452719166 +0100 +++ /var/tmp/diff_new_pack.i3iVvx/_new 2017-11-30 12:44:06.456719021 +0100 @@ -25,10 +25,10 @@ Group: Development/Libraries/C and C++ Url: http://dev.mysql.com/downloads/connector/ Source: http://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-%{vers… -# PATCH-FIX-UPSTREAM: work with mariadb versions properly too -Patch0: mariadb_api.patch # PATCH-FEATURE-OPENSUSE - mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch adam(a)mizerski.pl -- disable building tests and examples Patch2: mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch +# PATCH-FIX-UPSTREAM - bsc#1067883 kstreitova(a)suse.com -- fix build with libmariadb by fixing copypaste errors in libmysql_dynamic_proxy.cpp file +Patch3: mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -86,8 +86,8 @@ %prep %setup -q -n mysql-connector-c++-%{version} -%patch0 -p1 %patch2 -p1 +%patch3 -p1 chmod -x examples/* %build ++++++ mysql-connector-cpp-1.1.9-libmysql_dynamic_proxy_typos.patch ++++++ Index: mysql-connector-c++-1.1.9/driver/nativeapi/libmysql_dynamic_proxy.cpp =================================================================== --- mysql-connector-c++-1.1.9.orig/driver/nativeapi/libmysql_dynamic_proxy.cpp +++ mysql-connector-c++-1.1.9/driver/nativeapi/libmysql_dynamic_proxy.cpp @@ -434,7 +434,7 @@ LibmysqlDynamicProxy::options(MYSQL * my int LibmysqlDynamicProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg) { - ptr2mysql_get_option ptr2_get_option = symbol_safe_cast<ptr2mysql_options4>(GetProcAddr("mysql_get_option")); + ptr2mysql_get_option ptr2_get_option = symbol_safe_cast<ptr2mysql_get_option>(GetProcAddr("mysql_get_option")); if (ptr2_get_option != NULL) { if (((*ptr2_get_option)(mysql, option, arg))) { throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); @@ -813,7 +813,7 @@ LibmysqlDynamicProxy::stmt_free_result(M { ptr2mysql_stmt_free_result ptr2_stmt_free_result = symbol_safe_cast<ptr2mysql_stmt_free_result>(GetProcAddr("mysql_stmt_free_result")); - return (*ptr2_stmt_next_result)(stmt); + return (*ptr2_stmt_free_result)(stmt); } /* }}} */

1 0

commit apr-util for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package apr-util for openSUSE:Factory checked in at 2017-11-30 12:43:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apr-util (Old) and /work/SRC/openSUSE:Factory/.apr-util.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apr-util" Thu Nov 30 12:43:57 2017 rev:5 rq:544579 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/apr-util/apr-util.changes 2017-11-11 14:15:03.977183456 +0100 +++ /work/SRC/openSUSE:Factory/.apr-util.new/apr-util.changes 2017-11-30 12:43:57.845032099 +0100 @@ -1,0 +2,6 @@ +Wed Nov 22 16:46:50 UTC 2017 - dimstar(a)opensuse.org + +- Add apr-util-mariadb-10.2.patch: Fix detection / build with + MariaDB 10.2. + +------------------------------------------------------------------- New: ---- apr-util-mariadb-10.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apr-util.spec ++++++ --- /var/tmp/diff_new_pack.K0iVbY/_old 2017-11-30 12:43:59.504971752 +0100 +++ /var/tmp/diff_new_pack.K0iVbY/_new 2017-11-30 12:43:59.504971752 +0100 @@ -30,6 +30,8 @@ Source: http://www.apache.org/dist/apr/apr-util-%{version}.tar.bz2 Patch1: apr-util-1.4.1-testmemcache-initialize-values-array.patch Patch2: apr-util-visibility.patch +# PATCH-FIX-OPENSUSE apr-util-mariadb-10.2.patch dimstar(a)opensuse.org -- Fix build with mariadb 10.2 +Patch3: apr-util-mariadb-10.2.patch BuildRequires: apr-devel BuildRequires: autoconf BuildRequires: db-devel @@ -107,6 +109,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build echo 'HTML_TIMESTAMP=NO' >> docs/doxygen.conf ++++++ apr-util-mariadb-10.2.patch ++++++ Index: apr-util-1.6.1/build/dbd.m4 =================================================================== --- apr-util-1.6.1.orig/build/dbd.m4 +++ apr-util-1.6.1/build/dbd.m4 @@ -176,15 +176,13 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ APR_ADDTO(LIBS, [$mysql_LIBS]) fi - AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], + AC_CHECK_HEADERS([mysql.h], AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), - [apu_have_mysql=0; break], - [#include <my_global.h>]) + [apu_have_mysql=0; break]) if test "$apu_have_mysql" = "0"; then - AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], + AC_CHECK_HEADERS([mysql/mysql.h], AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), - [apu_have_mysql=0; break], - [#include <mysql/my_global.h>]) + [apu_have_mysql=0; break]) fi if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])

1 0

commit mariadb-connector-c for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package mariadb-connector-c for openSUSE:Factory checked in at 2017-11-30 12:43:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb-connector-c (Old) and /work/SRC/openSUSE:Factory/.mariadb-connector-c.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb-connector-c" Thu Nov 30 12:43:48 2017 rev:9 rq:544049 version:3.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb-connector-c/mariadb-connector-c.changes 2017-11-07 11:43:15.184813038 +0100 +++ /work/SRC/openSUSE:Factory/.mariadb-connector-c.new/mariadb-connector-c.changes 2017-11-30 12:43:56.861067872 +0100 @@ -1,0 +2,31 @@ +Sun Nov 19 07:41:13 UTC 2017 - mpluskal(a)suse.com + +- Use more cmake macros +- Run spec-cleaner + +------------------------------------------------------------------- +Fri Nov 17 14:20:39 UTC 2017 - adam.majer(a)suse.de + +- 0334aa48.patch: Backported implementation and testcase for + skipping particular paramset in bulk operation/. This is needed + to get current stable MariaDB connector/ODBC actually compilable. + +------------------------------------------------------------------- +Mon Nov 13 17:54:46 UTC 2017 - mpluskal(a)suse.com + +- Install missing header (bsc#1067904) + +------------------------------------------------------------------- +Thu Nov 2 17:07:25 UTC 2017 - kstreitova(a)suse.com + +- mariadb-connector-c is now a provider of the libmariadb library + for mariadb and others +- add compatibility symlinks +- change LIBDIR, INCLUDEDIR and PLUGINDIR paths to be the same as + it was in the mariadb package (compatibility reasons) +- add baselibs.conf +- add %{mariadb_version} macro that should correspond with the + current version of the mariadb package +- refresh absolute_path_fix.patch and private_library.patch + +------------------------------------------------------------------- New: ---- 0334aa48.patch baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb-connector-c.spec ++++++ --- /var/tmp/diff_new_pack.ejJAAS/_old 2017-11-30 12:43:57.593041261 +0100 +++ /var/tmp/diff_new_pack.ejJAAS/_new 2017-11-30 12:43:57.597041115 +0100 @@ -16,14 +16,14 @@ # -%bcond_with sqlite3 %define sover 3 %define libname libmariadb - +# equivalent mariadb version +%define mariadb_version 10.2.10 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif - +%bcond_with sqlite3 Name: mariadb-connector-c Version: 3.0.2 Release: 0 @@ -35,18 +35,19 @@ Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%… # Imported from keyserver based on keyid @ https://mariadb.com/kb/en/mariadb-enterprise/mariadb-enterprise-installatio… Source2: mariadb.keyring +Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch Patch3: absolute_path_fix.patch Patch4: private_library.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch5: 0334aa48.patch BuildRequires: cmake BuildRequires: curl-devel +BuildRequires: pkgconfig BuildRequires: pkgconfig(krb5) -BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) %if %{with sqlite3} -BuildRequires: sqlite3-devel +BuildRequires: pkgconfig(sqlite3) %endif %description @@ -65,7 +66,12 @@ %package -n %{libname}_plugins Summary: Plugins for the MariaDB C Connector +# We need "Conflicts" because we moved some plugins here: +# dialog.so was in mariadb-client package +# mysql_clear_password.so was in mariadb package Group: System/Libraries +Conflicts: mariadb <= 10.1.25 +Conflicts: mariadb-client <= 10.1.25 %description -n %{libname}_plugins MariaDB Connector is used to connect applications developed in @@ -84,10 +90,18 @@ This package holds the runtime components with private API. %package -n %{libname}-devel -Requires: %{libname}%{sover} = %{version} -Requires: pkgconfig(openssl) Summary: Development files for the MariaDB Connector C API Group: Development/Libraries/C and C++ +Requires: %{libname}%{sover} = %{version} +Requires: pkgconfig(openssl) +# mysql-devel needs to be provided as some pkgs still depend on it +Provides: mysql-devel = %{mariadb_version} +Obsoletes: mysql-devel < %{mariadb_version} +Provides: libmysqlclient-devel = %{mariadb_version} +Obsoletes: libmysqlclient-devel < %{mariadb_version} +# libmysqlclient_r.so was in libmysqlclient_r18 subpackage, now it's here +Provides: libmysqlclient_r18 = %{mariadb_version} +Obsoletes: libmysqlclient_r18 < %{mariadb_version} %description -n %{libname}-devel MariaDB Connector is used to connect applications developed in @@ -100,6 +114,7 @@ %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %cmake \ @@ -108,48 +123,57 @@ %endif -DWITH_EXTERNAL_ZLIB:BOOL=ON \ -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \ - -DINSTALL_LIBDIR:STRING=%{_libdir}/mariadb \ - -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mariadb/plugin/ \ + -DINSTALL_LIBDIR:STRING=%{_libdir} \ + -DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \ + -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \ -DWITH_MYSQLCOMPAT=ON \ -DWITH_SSL=OPENSSL -make %{?_smp_mflags} +%make_jobs %install %cmake_install # remove static linked libraries -rm %{buildroot}%{_libdir}/mariadb/libmariadbclient.a -rm %{buildroot}%{_libdir}/mariadb/libmysqlclient.a -rm %{buildroot}%{_libdir}/mariadb/libmysqlclient_r.a +rm %{buildroot}%{_libdir}/libmariadbclient.a +rm %{buildroot}%{_libdir}/libmysqlclient.a +rm %{buildroot}%{_libdir}/libmysqlclient_r.a + +# add a compatibility symlink +ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config +ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h + +# install some extra required header file +install -Dpm 0644 build/include/ma_config.h \ + %{buildroot}%{_includedir}/mysql/my_config.h + +%post -n %{libname}%{sover} -p /sbin/ldconfig +%post -n %{libname}private -p /sbin/ldconfig +%postun -n %{libname}%{sover} -p /sbin/ldconfig +%postun -n %{libname}private -p /sbin/ldconfig %files -n %{libname}%{sover} -%defattr(-,root,root) %doc README COPYING.LIB -%{_libdir}/mariadb/libmariadb.so.%{sover} +%{_libdir}/libmariadb.so.%{sover} %files -n %{libname}_plugins -%dir %{_libdir}/mariadb/ -%dir %{_libdir}/mariadb/plugin/ -%{_libdir}/mariadb/plugin/dialog.so -%{_libdir}/mariadb/plugin/mysql_clear_password.so -%{_libdir}/mariadb/plugin/auth_gssapi_client.so -%{_libdir}/mariadb/plugin/remote_io.so -%{_libdir}/mariadb/plugin/sha256_password.so +%dir %{_libdir}/mysql/ +%dir %{_libdir}/mysql/plugin/ +%{_libdir}/mysql/plugin/dialog.so +%{_libdir}/mysql/plugin/mysql_clear_password.so +%{_libdir}/mysql/plugin/auth_gssapi_client.so +%{_libdir}/mysql/plugin/remote_io.so +%{_libdir}/mysql/plugin/sha256_password.so %files -n %{libname}private -%{_libdir}/mariadb/libmariadbprivate.so +%{_libdir}/libmariadbprivate.so %files -n %{libname}-devel -%defattr(-,root,root) %{_bindir}/mariadb_config -%{_includedir}/mariadb/ -%{_libdir}/mariadb/libmariadb.so -%{_libdir}/mariadb/libmysqlclient.so -%{_libdir}/mariadb/libmysqlclient_r.so - -%post -n %{libname}%{sover} -p /sbin/ldconfig -%post -n %{libname}private -p /sbin/ldconfig -%postun -n %{libname}%{sover} -p /sbin/ldconfig -%postun -n %{libname}private -p /sbin/ldconfig +%{_bindir}/mysql_config +%dir %{_includedir}/mysql +%{_includedir}/mysql/* +%{_libdir}/libmariadb.so +%{_libdir}/libmysqlclient.so +%{_libdir}/libmysqlclient_r.so %changelog ++++++ 0334aa48.patch ++++++ commit 0334aa4811ae751d3362facad136c25b9765693a Author: Lawrin Novitsky <lawrin.novitsky(a)mariadb.com> Date: Mon Aug 14 17:23:42 2017 +0200 Implementation and testcase for CONC-275 - skipping particular paramset in bulk operation - with help of special indicator value STMT_INDICATOR_IGNORE_ROW set in any column of the row. The revision also adds some (mainly VS specific) file/dirs definitions to .gitignore to make 'gid status' usable on Windows, and the typo in bulk1 testsuite diff --git a/include/mariadb_stmt.h b/include/mariadb_stmt.h index 9e67ad8..5e1c711 100644 --- a/include/mariadb_stmt.h +++ b/include/mariadb_stmt.h @@ -81,7 +81,8 @@ enum enum_indicator_type STMT_INDICATOR_NONE=0, STMT_INDICATOR_NULL=1, STMT_INDICATOR_DEFAULT=2, - STMT_INDICATOR_IGNORE=3 + STMT_INDICATOR_IGNORE=3, + STMT_INDICATOR_IGNORE_ROW=4 }; /* diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c index aba845e..869c6ea 100644 --- a/libmariadb/mariadb_stmt.c +++ b/libmariadb/mariadb_stmt.c @@ -797,7 +797,21 @@ mem_error: } /* }}} */ -/* {{{ mysqlnd_stmt_execute_generate_bulk_request */ +/* {{{ mysql_stmt_skip_paramset */ +my_bool mysql_stmt_skip_paramset(MYSQL_STMT *stmt, uint row) +{ + uint i; + for (i=0; i < stmt->param_count; i++) + { + if (ma_get_indicator(stmt, i, row) == STMT_INDICATOR_IGNORE_ROW) + return '\1'; + } + + return '\0'; +} +/* }}} */ + +/* {{{ mysql_stmt_execute_generate_bulk_request */ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t *request_len) { /* execute packet has the following format: @@ -820,6 +834,7 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t STMT_INDICATOR_NULL 1 STMT_INDICATOR_DEFAULT 2 STMT_INDICATOR_IGNORE 3 + STMT_INDICATOR_SKIP_SET 4 n data from bind buffer */ @@ -894,6 +909,9 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t /* calculate data size */ for (j=0; j < stmt->array_size; j++) { + if (mysql_stmt_skip_paramset(stmt, j)) + continue; + for (i=0; i < stmt->param_count; i++) { size_t size= 0; diff --git a/unittest/libmariadb/bulk1.c b/unittest/libmariadb/bulk1.c index e5f6ec9..c6623ce 100644 --- a/unittest/libmariadb/bulk1.c +++ b/unittest/libmariadb/bulk1.c @@ -588,7 +588,7 @@ static int test_conc243(MYSQL *mysql) if (strcmp(row[0], "Monty") || strcmp(row[1], "Widenius")) { mysql_free_result(result); - diag("Wrong walues"); + diag("Wrong values"); return FAIL; } mysql_free_result(result); @@ -767,6 +767,92 @@ static int test_char_conv2(MYSQL *mysql) return OK; } + +static int bulk_skip_row(MYSQL *mysql) +{ + MYSQL_STMT *stmt; + MYSQL_BIND bind[3]; + MYSQL_RES *result; + MYSQL_ROW row; + + struct st_data { + unsigned long id; + char id_ind; + char forename[30]; + char forename_ind; + char surname[30]; + char surname_ind; + }; + + struct st_data data[]={ + { 0, STMT_INDICATOR_NULL, "Monty", STMT_INDICATOR_NTS, "Widenius", STMT_INDICATOR_IGNORE_ROW }, + { 0, STMT_INDICATOR_IGNORE_ROW, "David", STMT_INDICATOR_NTS, "Axmark", STMT_INDICATOR_NTS }, + { 0, STMT_INDICATOR_NULL, "default", STMT_INDICATOR_DEFAULT, "N.N.", STMT_INDICATOR_NTS }, + }; + + unsigned int array_size= 3; + size_t row_size= sizeof(struct st_data); + int rc; + + rc= mysql_query(mysql, "DROP TABLE IF EXISTS bulk_example2"); + check_mysql_rc(rc, mysql); + + rc= mysql_query(mysql, "CREATE TABLE bulk_example2 (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,"\ + "forename CHAR(30) NOT NULL DEFAULT 'unknown', surname CHAR(30))"); + check_mysql_rc(rc, mysql); + + stmt= mysql_stmt_init(mysql); + rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk_example2 VALUES (?,?,?)", -1); + check_stmt_rc(rc, stmt); + + memset(bind, 0, sizeof(MYSQL_BIND) * 3); + + /* We autogenerate id's, so all indicators are STMT_INDICATOR_NULL */ + bind[0].u.indicator= &data[0].id_ind; + bind[0].buffer_type= MYSQL_TYPE_LONG; + + bind[1].buffer= &data[0].forename; + bind[1].buffer_type= MYSQL_TYPE_STRING; + bind[1].u.indicator= &data[0].forename_ind; + + bind[2].buffer_type= MYSQL_TYPE_STRING; + bind[2].buffer= &data[0].surname; + bind[2].u.indicator= &data[0].surname_ind; + + /* set array size */ + mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size); + + /* set row size */ + mysql_stmt_attr_set(stmt, STMT_ATTR_ROW_SIZE, &row_size); + + /* bind parameter */ + mysql_stmt_bind_param(stmt, bind); + + /* execute */ + rc= mysql_stmt_execute(stmt); + check_stmt_rc(rc, stmt); + + mysql_stmt_close(stmt); + + rc= mysql_query(mysql, "SELECT forename, surname FROM bulk_example2"); + check_mysql_rc(rc, mysql); + + result= mysql_store_result(mysql); + FAIL_IF(!result || mysql_num_rows(result) != 1, "Invalid resultset"); + + row = mysql_fetch_row(result); + if (strcmp(row[0], "unknown") || strcmp(row[1], "N.N.")) + { + mysql_free_result(result); + diag("Wrong values"); + return FAIL; + } + mysql_free_result(result); + rc= mysql_query(mysql, "DROP TABLE bulk_example2"); + check_mysql_rc(rc, mysql); + return OK; +} + struct my_tests_st my_tests[] = { {"check_bulk", check_bulk, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, {"test_char_conv1", test_char_conv1, TEST_CONNECTION_NEW, 0, NULL, NULL}, @@ -780,6 +866,7 @@ struct my_tests_st my_tests[] = { {"bulk3", bulk3, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, {"bulk4", bulk4, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, {"bulk_null", bulk_null, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, + {"bulk_skip_row", bulk_skip_row, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, {NULL, NULL, 0, 0, NULL, NULL} }; ++++++ absolute_path_fix.patch ++++++ --- /var/tmp/diff_new_pack.ejJAAS/_old 2017-11-30 12:43:57.661038789 +0100 +++ /var/tmp/diff_new_pack.ejJAAS/_new 2017-11-30 12:43:57.661038789 +0100 @@ -13,7 +13,7 @@ -#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" -#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb "\ +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" -+#define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ ++#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE @@ -23,3 +23,26 @@ #define SOCKET "@MARIADB_UNIX_ADDR@" #define PORT "@MARIADB_PORT@" #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" +Index: mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in +=================================================================== +--- mariadb-connector-c-3.0.2-src.orig/mariadb_config/libmariadb.pc.in ++++ mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in +@@ -6,14 +6,14 @@ + # Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) + # + +-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ +-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ ++libdir=@INCLUDE_INSTALL_DIR@ + prefix=@PREFIX_INSTALL_DIR@ + + Name: libmariadb + Version: @LIBMARIADB_VERSION@ + Description: MariaDB Connector/C dynamic library +-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ +-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ ++Cflags: -I@INCLUDE_INSTALL_DIR@ @CMAKE_C_FLAGS@ ++Libs: -L@LIB_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ + + ++++++ baselibs.conf ++++++ libmariadb3 provides "libmysqlclient.so.18" provides "libmysqlclient.so.18(libmysqlclient_18)" ++++++ private_library.patch ++++++ --- /var/tmp/diff_new_pack.ejJAAS/_old 2017-11-30 12:43:57.721036607 +0100 +++ /var/tmp/diff_new_pack.ejJAAS/_new 2017-11-30 12:43:57.725036462 +0100 @@ -53,9 +53,9 @@ +++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in @@ -8,6 +8,8 @@ static char *mariadb_progname; #define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb" - #define LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadb" \ + #define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\ "@extra_dynamic_LDFLAGS@" -+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@/mariadb -lmariadbprivate" \ ++#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " \ + "@extra_dynamic_LDFLAGS@" #define LIBS_SYS "@extra_dynamic_LDFLAGS@" #define CFLAGS INCLUDE

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2017-11-30 12:42:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Thu Nov 30 12:42:59 2017 rev:260 rq:545695 version:57.0 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2017-11-16 14:00:40.506363155 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2017-11-30 12:43:48.853358995 +0100 @@ -1,0 +2,18 @@ +Tue Nov 21 09:00:48 UTC 2017 - christophe(a)krop.fr + +- Add mozilla-bmo1360278.patch + Starting with Firefox 57, the context menu appears on key press. + This patch creates a config entry to restore the + old behaviour. Without the patch, the mouse gesture extensions + require 2 clicks to work (bmo#1360278). + The new config entry is named ui.context_menus.after_mouseup + (default : false). + +------------------------------------------------------------------- +Sat Nov 18 08:35:21 UTC 2017 - wr(a)rosenauer.org + +- Allow experimental CSD for Gtk3 (bmo#1399611) if available and enabled + widget.allow-client-side-decoration=true + (mozilla-bmo1399611-csd.patch) + +------------------------------------------------------------------- New: ---- mozilla-bmo1360278.patch mozilla-bmo1399611-csd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.7XHBJa/_old 2017-11-30 12:43:56.301088230 +0100 +++ /var/tmp/diff_new_pack.7XHBJa/_new 2017-11-30 12:43:56.305088085 +0100 @@ -153,6 +153,8 @@ Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bindgen-systemlibs.patch +Patch9: mozilla-bmo1360278.patch +Patch10: mozilla-bmo1399611-csd.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch @@ -264,6 +266,8 @@ %endif %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 # Firefox %patch101 -p1 %patch102 -p1 ++++++ mozilla-bmo1360278.patch ++++++ # HG changeset patch # User Robin Grenet <robin.grenet(a)wanadoo.fr> # Date 1510835758 -3600 # Node ID f540f9e801cb2e0be5259baea13dfce953ccb520 # Parent 0abbf75bd0ecfa99ab4386f551a622983f5f27ea Bug 1360278 - Add preference to trigger context menu on mouse up for GTK+ and macOS, r=mstange,smaug MozReview-Commit-ID: Bg60bD8jIg6 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -229,16 +229,20 @@ pref("dom.script_loader.bytecode_cache.e pref("dom.script_loader.bytecode_cache.strategy", 0); // Fastback caching - if this pref is negative, then we calculate the number // of content viewers to cache based on the amount of available memory. pref("browser.sessionhistory.max_total_viewers", -1); pref("ui.use_native_colors", true); pref("ui.click_hold_context_menus", false); + +// Pop up context menu on mouseup instead of mousedown, if that's the OS default. +// Note: ignored on Windows (context menus always use mouseup) +pref("ui.context_menus.after_mouseup", false); // Duration of timeout of incremental search in menus (ms). 0 means infinite. pref("ui.menu.incremental_search.timeout", 1000); // If true, all popups won't hide automatically on blur pref("ui.popup.disable_autohide", false); pref("browser.display.use_document_fonts", 1); // 0 = never, 1 = quick, 2 = always // 0 = default: always, except in high contrast mode // 1 = always diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -4695,18 +4695,20 @@ NSEvent* gLastDragMouseDownEvent = nil; [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent]; geckoEvent.button = WidgetMouseEvent::eRightButton; geckoEvent.mClickCount = [theEvent clickCount]; mGeckoChild->DispatchInputEvent(&geckoEvent); if (!mGeckoChild) return; - // Let the superclass do the context menu stuff. - [super rightMouseDown:theEvent]; + if (!nsBaseWidget::ShowContextMenuAfterMouseUp()) { + // Let the superclass do the context menu stuff. + [super rightMouseDown:theEvent]; + } NS_OBJC_END_TRY_ABORT_BLOCK; } - (void)rightMouseUp:(NSEvent *)theEvent { NS_OBJC_BEGIN_TRY_ABORT_BLOCK; @@ -4719,16 +4721,33 @@ NSEvent* gLastDragMouseDownEvent = nil; WidgetMouseEvent geckoEvent(true, eMouseUp, mGeckoChild, WidgetMouseEvent::eReal); [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent]; geckoEvent.button = WidgetMouseEvent::eRightButton; geckoEvent.mClickCount = [theEvent clickCount]; nsAutoRetainCocoaObject kungFuDeathGrip(self); mGeckoChild->DispatchInputEvent(&geckoEvent); + if (!mGeckoChild) + return; + + if (nsBaseWidget::ShowContextMenuAfterMouseUp()) { + // Let the superclass do the context menu stuff, but pretend it's rightMouseDown. + NSEvent *dupeEvent = [NSEvent mouseEventWithType:NSRightMouseDown + location:theEvent.locationInWindow + modifierFlags:theEvent.modifierFlags + timestamp:theEvent.timestamp + windowNumber:theEvent.windowNumber + context:theEvent.context + eventNumber:theEvent.eventNumber + clickCount:theEvent.clickCount + pressure:theEvent.pressure]; + + [super rightMouseDown:dupeEvent]; + } NS_OBJC_END_TRY_ABORT_BLOCK; } - (void)rightMouseDragged:(NSEvent*)theEvent { if (!mGeckoChild) return; diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -2733,16 +2733,29 @@ nsWindow::InitButtonEvent(WidgetMouseEve } static guint ButtonMaskFromGDKButton(guint button) { return GDK_BUTTON1_MASK << (button - 1); } void +nsWindow::DispatchContextMenuEventFromMouseEvent(uint16_t domButton, + GdkEventButton *aEvent) +{ + if (domButton == WidgetMouseEvent::eRightButton && MOZ_LIKELY(!mIsDestroyed)) { + WidgetMouseEvent contextMenuEvent(true, eContextMenu, this, + WidgetMouseEvent::eReal); + InitButtonEvent(contextMenuEvent, aEvent); + contextMenuEvent.pressure = mLastMotionPressure; + DispatchInputEvent(&contextMenuEvent); + } +} + +void nsWindow::OnButtonPressEvent(GdkEventButton *aEvent) { LOG(("Button %u press on %p\n", aEvent->button, (void *)this)); // If you double click in GDK, it will actually generate a second // GDK_BUTTON_PRESS before sending the GDK_2BUTTON_PRESS, and this is // different than the DOM spec. GDK puts this in the queue // programatically, so it's safe to assume that if there's a @@ -2801,23 +2814,18 @@ nsWindow::OnButtonPressEvent(GdkEventBut WidgetMouseEvent event(true, eMouseDown, this, WidgetMouseEvent::eReal); event.button = domButton; InitButtonEvent(event, aEvent); event.pressure = mLastMotionPressure; DispatchInputEvent(&event); // right menu click on linux should also pop up a context menu - if (domButton == WidgetMouseEvent::eRightButton && - MOZ_LIKELY(!mIsDestroyed)) { - WidgetMouseEvent contextMenuEvent(true, eContextMenu, this, - WidgetMouseEvent::eReal); - InitButtonEvent(contextMenuEvent, aEvent); - contextMenuEvent.pressure = mLastMotionPressure; - DispatchInputEvent(&contextMenuEvent); + if (!nsBaseWidget::ShowContextMenuAfterMouseUp()) { + DispatchContextMenuEventFromMouseEvent(domButton, aEvent); } } void nsWindow::OnButtonReleaseEvent(GdkEventButton *aEvent) { LOG(("Button %u release on %p\n", aEvent->button, (void *)this)); @@ -2843,16 +2851,21 @@ nsWindow::OnButtonReleaseEvent(GdkEventB event.button = domButton; InitButtonEvent(event, aEvent); gdouble pressure = 0; gdk_event_get_axis ((GdkEvent*)aEvent, GDK_AXIS_PRESSURE, &pressure); event.pressure = pressure ? pressure : mLastMotionPressure; DispatchInputEvent(&event); mLastMotionPressure = pressure; + + // right menu click on linux should also pop up a context menu + if (nsBaseWidget::ShowContextMenuAfterMouseUp()) { + DispatchContextMenuEventFromMouseEvent(domButton, aEvent); + } } void nsWindow::OnContainerFocusInEvent(GdkEventFocus *aEvent) { LOGFOCUS(("OnContainerFocusInEvent [%p]\n", (void *)this)); // Unset the urgency hint, if possible diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h --- a/widget/gtk/nsWindow.h +++ b/widget/gtk/nsWindow.h @@ -240,16 +240,18 @@ private: LayoutDeviceIntSize GetSafeWindowSize(LayoutDeviceIntSize aSize); void EnsureGrabs (void); void GrabPointer (guint32 aTime); void ReleaseGrabs (void); void UpdateClientOffset(); + void DispatchContextMenuEventFromMouseEvent(uint16_t domButton, + GdkEventButton *aEvent); public: void ThemeChanged(void); void OnDPIChanged(void); void OnCheckResize(void); void OnCompositedChanged(void); #ifdef MOZ_X11 Window mOldFocusWindow; diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp --- a/widget/nsBaseWidget.cpp +++ b/widget/nsBaseWidget.cpp @@ -1213,16 +1213,32 @@ nsBaseWidget::DispatchEventToAPZOnly(moz if (mAPZC) { MOZ_ASSERT(APZThreadUtils::IsControllerThread()); uint64_t inputBlockId = 0; ScrollableLayerGuid guid; mAPZC->ReceiveInputEvent(*aEvent, &guid, &inputBlockId); } } +// static +bool +nsBaseWidget::ShowContextMenuAfterMouseUp() +{ + static bool gContextMenuAfterMouseUp = false; + static bool gContextMenuAfterMouseUpCached = false; + if (!gContextMenuAfterMouseUpCached) { + Preferences::AddBoolVarCache(&gContextMenuAfterMouseUp, + "ui.context_menus.after_mouseup", + false); + + gContextMenuAfterMouseUpCached = true; + } + return gContextMenuAfterMouseUp; +} + nsIDocument* nsBaseWidget::GetDocument() const { if (mWidgetListener) { if (nsIPresShell* presShell = mWidgetListener->GetPresShell()) { return presShell->GetDocument(); } } diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h --- a/widget/nsBaseWidget.h +++ b/widget/nsBaseWidget.h @@ -412,16 +412,22 @@ public: void NotifyLiveResizeStopped(); #if defined(MOZ_WIDGET_ANDROID) void RecvToolbarAnimatorMessageFromCompositor(int32_t) override {}; void UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom) override {}; void RecvScreenPixels(mozilla::ipc::Shmem&& aMem, const ScreenIntSize& aSize) override {}; #endif + /** + * Whether context menus should only appear on mouseup instead of mousedown, + * on OSes where they normally appear on mousedown (macOS, *nix). + */ + static bool ShowContextMenuAfterMouseUp(); + protected: // These are methods for CompositorWidgetWrapper, and should only be // accessed from that class. Derived widgets can choose which methods to // implement, or none if supporting out-of-process compositing. virtual bool PreRender(mozilla::widget::WidgetRenderingContext* aContext) { return true; } virtual void PostRender(mozilla::widget::WidgetRenderingContext* aContext) ++++++ mozilla-bmo1399611-csd.patch ++++++ ++++ 1744 lines (skipped)

1 0

commit cargo for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package cargo for openSUSE:Factory checked in at 2017-11-30 12:42:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cargo (Old) and /work/SRC/openSUSE:Factory/.cargo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cargo" Thu Nov 30 12:42:51 2017 rev:13 rq:545595 version:0.22.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cargo/cargo.changes 2017-11-23 09:36:23.530076053 +0100 +++ /work/SRC/openSUSE:Factory/.cargo.new/cargo.changes 2017-11-30 12:43:47.921392877 +0100 @@ -1,0 +2,6 @@ +Fri Nov 24 15:42:54 UTC 2017 - mmanu84(a)outlook.de + +- adapt cargo bootstrap version to 0.23 +- adapt rustc bootstrap version to 1.22.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cargo.spec ++++++ --- /var/tmp/diff_new_pack.pRdQq6/_old 2017-11-30 12:43:48.629367139 +0100 +++ /var/tmp/diff_new_pack.pRdQq6/_new 2017-11-30 12:43:48.629367139 +0100 @@ -19,15 +19,9 @@ # -%global bootstrap_version 0.22.0 -%global bootstrap_rustc_version 1.21.0 -%global current_rustc_version 1.21.0 - -# context hasn't been ported to all architectures yet -%ifarch %arm aarch64 -%define _with_cargo_bootstrap 1 -%endif - +%global bootstrap_version 0.23.0 +%global bootstrap_rustc_version 1.22.1 +%global current_rustc_version 1.22.1 %bcond_with cargo_bootstrap %global rust_arch %{_arch}

1 0

commit rust for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package rust for openSUSE:Factory checked in at 2017-11-30 12:42:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rust (Old) and /work/SRC/openSUSE:Factory/.rust.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rust" Thu Nov 30 12:42:28 2017 rev:21 rq:545594 version:1.22.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rust/rust.changes 2017-10-25 17:44:10.932818098 +0200 +++ /work/SRC/openSUSE:Factory/.rust.new/rust.changes 2017-11-30 12:43:41.681619727 +0100 @@ -1,0 +2,44 @@ +Sat Nov 25 09:54:46 UTC 2017 - mmanu84(a)outlook.de + +- Update to v1.22.1 +- Update Cargo to fix an issue with macOS 10.13 "High Sierra" + +------------------------------------------------------------------- +Thu Nov 23 00:27:24 UTC 2017 - jones_ld(a)protonmail.com + +- Update to v1.22.0 +- Language changes: + + `non_snake_case` lint now allows extern no-mangle functions + + Now accepts underscores in unicode escapes + + `T op= &T` now works for numeric types. eg. `let mut x = 2; x += &8;` + + types that impl `Drop` are now allowed in `const` and `static` types +- Compiler changes: + + rustc now defaults to having 16 codegen units at debug on supported platforms + + rustc will no longer inline in codegen units when compiling for debug + This should decrease compile times for debug builds. + + strict memory alignment now enabled on ARMv6 + + Remove support for the PNaCl target `le32-unknown-nacl` +- Librarie changes + + Allow atomic operations up to 32 bits + on `armv5te_unknown_linux_gnueabi` + + `Box<Error>` now impls `From<Cow<str>>` + + `std::mem::Discriminant` is now guaranteed to be `Send + Sync` + + `fs::copy` now returns the length of the main stream on NTFS. + + Properly detect overflow in `Instant += Duration`. + + impl `Hasher` for `{&mut Hasher, Box<Hasher>}` + + impl `fmt::Debug` for `SplitWhitespace`.][44303] + + `Option<T>` now impls `Try`. This allows for using `?` with `Option` types. +- Misc + + `libbacktrace` is now available on Apple platforms. + + Stabilised the `compile_fail` attribute for code fences in doc-comments. + This now lets you specify that a given code example will fail to compile. +- Compatibility Notes + + The minimum Android version that rustc can build for has been bumped + to `4.0` from `2.3` + + Allowing `T op= &T` for numeric types has broken some type inference cases + +- Remove rust-1.21.0-44203-exclude-compiler-rt-test.patch +- Remove rust-1.21.0-44066-ppc64-struct-abi.patch +- Remove rust-1.21.0-44440-s390x-global-align.patch + +------------------------------------------------------------------- Old: ---- cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz cargo-0.22.0-armv7-unknown-linux-gnueabihf.tar.gz cargo-0.22.0-i686-unknown-linux-gnu.tar.gz cargo-0.22.0-powerpc64-unknown-linux-gnu.tar.gz cargo-0.22.0-powerpc64le-unknown-linux-gnu.tar.gz cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz rust-1.21.0-44066-ppc64-struct-abi.patch rust-1.21.0-44203-exclude-compiler-rt-test.patch rust-1.21.0-44440-s390x-global-align.patch rustc-1.21.0-src.tar.gz New: ---- cargo-0.23.0-aarch64-unknown-linux-gnu.tar.gz cargo-0.23.0-arm-unknown-linux-gnueabihf.tar.gz cargo-0.23.0-armv7-unknown-linux-gnueabihf.tar.gz cargo-0.23.0-i686-unknown-linux-gnu.tar.gz cargo-0.23.0-powerpc64-unknown-linux-gnu.tar.gz cargo-0.23.0-powerpc64le-unknown-linux-gnu.tar.gz cargo-0.23.0-s390x-unknown-linux-gnu.tar.gz cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz rustc-1.22.1-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rust.spec ++++++ --- /var/tmp/diff_new_pack.LnHBIe/_old 2017-11-30 12:43:45.141493942 +0100 +++ /var/tmp/diff_new_pack.LnHBIe/_new 2017-11-30 12:43:45.149493651 +0100 @@ -17,8 +17,8 @@ # -%global prev_rust 1.20.0 -%global cargo_version 0.22.0 +%global prev_rust 1.21.0 +%global cargo_version 0.23.0 %bcond_with rust_bootstrap %global rust_arch %{_arch} @@ -27,6 +27,10 @@ %global rust_arch armv7 %global abi gnueabihf %endif +%ifarch armv6hl +%global rust_arch arm +%global abi gnueabihf +%endif %ifarch ppc64 %global rust_arch powerpc64 %endif @@ -44,7 +48,7 @@ %global rustlibdir %{common_libdir}/rustlib Name: rust -Version: 1.21.0 +Version: 1.22.1 Release: 0 Summary: A systems programming language License: MIT or Apache-2.0 @@ -57,13 +61,11 @@ Source101: cargo-%{cargo_version}-i686-unknown-linux-gnu.tar.gz Source102: cargo-%{cargo_version}-aarch64-unknown-linux-gnu.tar.gz Source103: cargo-%{cargo_version}-armv7-unknown-linux-gnueabihf.tar.gz -Source104: cargo-%{cargo_version}-powerpc64-unknown-linux-gnu.tar.gz -Source105: cargo-%{cargo_version}-powerpc64le-unknown-linux-gnu.tar.gz -Source106: cargo-%{cargo_version}-s390x-unknown-linux-gnu.tar.gz +Source104: cargo-%{cargo_version}-arm-unknown-linux-gnueabihf.tar.gz +Source105: cargo-%{cargo_version}-powerpc64-unknown-linux-gnu.tar.gz +Source106: cargo-%{cargo_version}-powerpc64le-unknown-linux-gnu.tar.gz +Source107: cargo-%{cargo_version}-s390x-unknown-linux-gnu.tar.gz # PATCH-FIX-OPENSUSE: Set DT_SONAME when building dylibs -Patch1: rust-1.21.0-44203-exclude-compiler-rt-test.patch -Patch2: rust-1.21.0-44066-ppc64-struct-abi.patch -Patch3: rust-1.21.0-44440-s390x-global-align.patch BuildRequires: ccache BuildRequires: cmake >= 3.4.3 BuildRequires: curl @@ -168,23 +170,23 @@ %ifarch armv7hl %setup -q -T -b 103 -n cargo-%{cargo_version}-%{rust_triple} %endif -%ifarch ppc64 +%ifarch armv6hl %setup -q -T -b 104 -n cargo-%{cargo_version}-%{rust_triple} %endif -%ifarch ppc64le +%ifarch ppc64 %setup -q -T -b 105 -n cargo-%{cargo_version}-%{rust_triple} %endif -%ifarch s390x +%ifarch ppc64le %setup -q -T -b 106 -n cargo-%{cargo_version}-%{rust_triple} %endif +%ifarch s390x +%setup -q -T -b 107 -n cargo-%{cargo_version}-%{rust_triple} +%endif # The cargo binary is only used to build rust and is not shipped %global cargo_bin %{_builddir}/cargo-%{cargo_version}-%{rust_triple}/cargo/bin/cargo %setup -q -n rustc-%{version}-src -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 sed -e 's:<cargo-bin>:%{cargo_bin}:g' \ -e 's:<rust-triple>:%{rust_triple}:g' \ -e 's:<prefix>:%{_prefix}:g' \ @@ -196,7 +198,7 @@ %build export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint -./x.py build --config config.toml +RUST_BACKTRACE=1 ./x.py build --config config.toml ./x.py doc --config config.toml %install ++++++ cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz -> cargo-0.23.0-aarch64-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-aarch64-unknown-linux-gnu/README.md new/cargo-0.23.0-aarch64-unknown-linux-gnu/README.md --- old/cargo-0.22.0-aarch64-unknown-linux-gnu/README.md 2017-10-10 00:11:08.000000000 +0200 +++ new/cargo-0.23.0-aarch64-unknown-linux-gnu/README.md 2017-11-23 00:20:36.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license Binary files old/cargo-0.22.0-aarch64-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.23.0-aarch64-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-aarch64-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.23.0-aarch64-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.22.0-aarch64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-10-10 00:11:08.000000000 +0200 +++ new/cargo-0.23.0-aarch64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-11-23 00:20:36.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-aarch64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 new/cargo-0.23.0-aarch64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 --- old/cargo-0.22.0-aarch64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-10-10 00:11:08.000000000 +0200 +++ new/cargo-0.23.0-aarch64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-11-23 00:20:36.000000000 +0100 @@ -43,7 +43,7 @@ .RE .SH EXAMPLES .PP -Retrive package specification for foo package +Retrieve package specification for foo package .IP .nf \f[C] @@ -59,7 +59,7 @@ \f[] .fi .PP -Retrive package specification for foo from crates.io +Retrieve package specification for foo from crates.io .IP .nf \f[C] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-aarch64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 new/cargo-0.23.0-aarch64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 --- old/cargo-0.22.0-aarch64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-10-10 00:11:08.000000000 +0200 +++ new/cargo-0.23.0-aarch64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-11-23 00:20:36.000000000 +0100 @@ -96,6 +96,11 @@ .RS .RE .TP +.B cargo\-rustc(1) +Compile the current project, and optionally pass additional rustc parameters +.RS +.RE +.TP .B cargo\-package(1) Generate a source tarball for the current package. .RS @@ -121,6 +126,11 @@ .RS .RE .TP +.B cargo\-help(1) +Display help for a cargo command +.RS +.RE +.TP .B cargo\-version(1) Print cargo\[aq]s version and exit. .RS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-aarch64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo new/cargo-0.23.0-aarch64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo --- old/cargo-0.22.0-aarch64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-10-10 00:11:08.000000000 +0200 +++ new/cargo-0.23.0-aarch64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-11-23 00:20:36.000000000 +0100 @@ -1,19 +1,29 @@ #compdef cargo -typeset -A opt_args autoload -U regexp-replace zstyle -T ':completion:*:*:cargo:*' tag-order && \ zstyle ':completion:*:*:cargo:*' tag-order 'common-commands' _cargo() { +local context state state_descr line +typeset -A opt_args +# leading items in parentheses are an exclusion list for the arguments following that arg +# See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Fu… +# - => exclude all other options +# 1 => exclude positional arg 1 +# * => exclude all other args +# +blah => exclude +blah _arguments \ '(- 1 *)'{-h,--help}'[show help message]' \ - '(- 1 *)'--list'[list installed commands]' \ - '(- 1 *)'{-v,--verbose}'[use verbose output]' \ - '(- 1 *)'--color'[colorization option]' \ + '(- 1 *)--list[list installed commands]' \ '(- 1 *)'{-V,--version}'[show version information]' \ + {-v,--verbose}'[use verbose output]' \ + --color'[colorization option]' \ + '(+beta +nightly)+stable[use the stable toolchain]' \ + '(+stable +nightly)+beta[use the beta toolchain]' \ + '(+stable +beta)+nightly[use the nightly toolchain]' \ '1: :->command' \ '*:: :->args' @@ -163,10 +173,10 @@ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \ '--no-default-features[do not build the default features]' \ - '--path=[local filesystem path to crate to install]' \ + '--path=[local filesystem path to crate to install]: :_files -/' \ '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \ '--rev=[specific commit to use when installing from git]' \ - '--root=[directory to install packages into]' \ + '--root=[directory to install packages into]: :_files -/' \ '--tag=[tag to use when installing from git]' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ '--vers=[version to install from crates.io]' \ @@ -291,7 +301,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to fetch dependencies for]' \ + '--manifest-path=[path to the manifest to fetch dependencies for]: :_files -/' \ '--no-default-features[do not compile default features for the package]' \ '(-p, --package)'{-p,--package}'=[profile to compile for]' \ '--profile=[profile to build the selected target for]' \ @@ -309,7 +319,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to document]' \ + '--manifest-path=[path to the manifest to document]: :_files -/' \ '--no-default-features[do not build the `default` feature]' \ '--open[open the docs in a browser after the operation]' \ '(-p, --package)'{-p,--package}'=[package to document]' \ @@ -365,7 +375,7 @@ '--color=:colorization option:(auto always never)' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \ - '--root=[directory to uninstall packages from]' \ + '--root=[directory to uninstall packages from]: :_files -/' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ ;; @@ -531,5 +541,4 @@ '(--bench --bin --example --lib)--test=[test name]' ) - _cargo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-aarch64-unknown-linux-gnu/install.sh new/cargo-0.23.0-aarch64-unknown-linux-gnu/install.sh --- old/cargo-0.22.0-aarch64-unknown-linux-gnu/install.sh 2017-10-10 00:11:08.000000000 +0200 +++ new/cargo-0.23.0-aarch64-unknown-linux-gnu/install.sh 2017-11-23 00:20:36.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2014 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. @@ -319,62 +319,6 @@ (unset CDPATH && cd "$path" > /dev/null && pwd) } -get_host_triple() { - local _uname_value=$(uname -s) - local _ostype - case $_uname_value in - - Linux) - _ostype=unknown-linux-gnu - ;; - - FreeBSD) - _ostype=unknown-freebsd - ;; - - DragonFly) - _ostype=unknown-dragonfly - ;; - - Bitrig) - _ostype=unknown-bitrig - ;; - - NetBSD) - _ostype=unknown-netbsd - ;; - - OpenBSD) - _ostype=unknown-openbsd - ;; - - Darwin) - _ostype=apple-darwin - ;; - - MINGW*) - _ostype=pc-windows-gnu - ;; - - MSYS*) - _ostype=pc-windows-gnu - ;; - - CYGWIN*) - _ostype=pc-windows-gnu - ;; - Haiku) - _ostype=unknown-haiku - ;; - - *) - err "unknown value from uname -s: $_uname_value" - ;; - esac - - RETVAL="$_ostype" -} - uninstall_legacy() { local _abs_libdir="$1" @@ -675,11 +619,13 @@ maybe_backup_path "$_file_install_path" - if echo "$_file" | grep "^bin/" > /dev/null + if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" then - run install -m755 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" else - run install -m644 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 644 "$_file_install_path" fi critical_need_ok "file creation failed" @@ -719,11 +665,10 @@ maybe_configure_ld() { local _abs_libdir="$1" - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" = "unknown-linux-gnu" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then + if [ "$_ostype" = "Linux" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then # Fedora-based systems do not configure the dynamic linker to look # /usr/local/lib, which is our default installation directory. To @@ -756,11 +701,10 @@ } maybe_unconfigure_ld() { - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" != "unknown-linux-gnu" ]; then + if [ "$_ostype" != "Linux" ]; then return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-aarch64-unknown-linux-gnu/version new/cargo-0.23.0-aarch64-unknown-linux-gnu/version --- old/cargo-0.22.0-aarch64-unknown-linux-gnu/version 2017-10-10 00:11:08.000000000 +0200 +++ new/cargo-0.23.0-aarch64-unknown-linux-gnu/version 2017-11-23 00:20:36.000000000 +0100 @@ -1 +1 @@ -0.22.0 (3423351a5 2017-10-06) \ No newline at end of file +0.23.0 (61fa02415 2017-11-22) \ No newline at end of file ++++++ cargo-0.22.0-armv7-unknown-linux-gnueabihf.tar.gz -> cargo-0.23.0-armv7-unknown-linux-gnueabihf.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/README.md new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/README.md --- old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/README.md 2017-10-09 23:41:13.000000000 +0200 +++ new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/README.md 2017-11-23 00:16:49.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license Binary files old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/cargo/bin/cargo and new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md --- old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md 2017-10-09 23:41:13.000000000 +0200 +++ new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md 2017-11-23 00:16:49.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/cargo/share/man/man1/cargo-pkgid.1 new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/cargo/share/man/man1/cargo-pkgid.1 --- old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/cargo/share/man/man1/cargo-pkgid.1 2017-10-09 23:41:13.000000000 +0200 +++ new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/cargo/share/man/man1/cargo-pkgid.1 2017-11-23 00:16:49.000000000 +0100 @@ -43,7 +43,7 @@ .RE .SH EXAMPLES .PP -Retrive package specification for foo package +Retrieve package specification for foo package .IP .nf \f[C] @@ -59,7 +59,7 @@ \f[] .fi .PP -Retrive package specification for foo from crates.io +Retrieve package specification for foo from crates.io .IP .nf \f[C] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/cargo/share/man/man1/cargo.1 new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/cargo/share/man/man1/cargo.1 --- old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/cargo/share/man/man1/cargo.1 2017-10-09 23:41:13.000000000 +0200 +++ new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/cargo/share/man/man1/cargo.1 2017-11-23 00:16:49.000000000 +0100 @@ -96,6 +96,11 @@ .RS .RE .TP +.B cargo\-rustc(1) +Compile the current project, and optionally pass additional rustc parameters +.RS +.RE +.TP .B cargo\-package(1) Generate a source tarball for the current package. .RS @@ -121,6 +126,11 @@ .RS .RE .TP +.B cargo\-help(1) +Display help for a cargo command +.RS +.RE +.TP .B cargo\-version(1) Print cargo\[aq]s version and exit. .RS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/cargo/share/zsh/site-functions/_cargo new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/cargo/share/zsh/site-functions/_cargo --- old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/cargo/share/zsh/site-functions/_cargo 2017-10-09 23:41:13.000000000 +0200 +++ new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/cargo/share/zsh/site-functions/_cargo 2017-11-23 00:16:49.000000000 +0100 @@ -1,19 +1,29 @@ #compdef cargo -typeset -A opt_args autoload -U regexp-replace zstyle -T ':completion:*:*:cargo:*' tag-order && \ zstyle ':completion:*:*:cargo:*' tag-order 'common-commands' _cargo() { +local context state state_descr line +typeset -A opt_args +# leading items in parentheses are an exclusion list for the arguments following that arg +# See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Fu… +# - => exclude all other options +# 1 => exclude positional arg 1 +# * => exclude all other args +# +blah => exclude +blah _arguments \ '(- 1 *)'{-h,--help}'[show help message]' \ - '(- 1 *)'--list'[list installed commands]' \ - '(- 1 *)'{-v,--verbose}'[use verbose output]' \ - '(- 1 *)'--color'[colorization option]' \ + '(- 1 *)--list[list installed commands]' \ '(- 1 *)'{-V,--version}'[show version information]' \ + {-v,--verbose}'[use verbose output]' \ + --color'[colorization option]' \ + '(+beta +nightly)+stable[use the stable toolchain]' \ + '(+stable +nightly)+beta[use the beta toolchain]' \ + '(+stable +beta)+nightly[use the nightly toolchain]' \ '1: :->command' \ '*:: :->args' @@ -163,10 +173,10 @@ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \ '--no-default-features[do not build the default features]' \ - '--path=[local filesystem path to crate to install]' \ + '--path=[local filesystem path to crate to install]: :_files -/' \ '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \ '--rev=[specific commit to use when installing from git]' \ - '--root=[directory to install packages into]' \ + '--root=[directory to install packages into]: :_files -/' \ '--tag=[tag to use when installing from git]' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ '--vers=[version to install from crates.io]' \ @@ -291,7 +301,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to fetch dependencies for]' \ + '--manifest-path=[path to the manifest to fetch dependencies for]: :_files -/' \ '--no-default-features[do not compile default features for the package]' \ '(-p, --package)'{-p,--package}'=[profile to compile for]' \ '--profile=[profile to build the selected target for]' \ @@ -309,7 +319,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to document]' \ + '--manifest-path=[path to the manifest to document]: :_files -/' \ '--no-default-features[do not build the `default` feature]' \ '--open[open the docs in a browser after the operation]' \ '(-p, --package)'{-p,--package}'=[package to document]' \ @@ -365,7 +375,7 @@ '--color=:colorization option:(auto always never)' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \ - '--root=[directory to uninstall packages from]' \ + '--root=[directory to uninstall packages from]: :_files -/' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ ;; @@ -531,5 +541,4 @@ '(--bench --bin --example --lib)--test=[test name]' ) - _cargo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/install.sh new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/install.sh --- old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/install.sh 2017-10-09 23:41:13.000000000 +0200 +++ new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/install.sh 2017-11-23 00:16:49.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2014 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. @@ -319,62 +319,6 @@ (unset CDPATH && cd "$path" > /dev/null && pwd) } -get_host_triple() { - local _uname_value=$(uname -s) - local _ostype - case $_uname_value in - - Linux) - _ostype=unknown-linux-gnu - ;; - - FreeBSD) - _ostype=unknown-freebsd - ;; - - DragonFly) - _ostype=unknown-dragonfly - ;; - - Bitrig) - _ostype=unknown-bitrig - ;; - - NetBSD) - _ostype=unknown-netbsd - ;; - - OpenBSD) - _ostype=unknown-openbsd - ;; - - Darwin) - _ostype=apple-darwin - ;; - - MINGW*) - _ostype=pc-windows-gnu - ;; - - MSYS*) - _ostype=pc-windows-gnu - ;; - - CYGWIN*) - _ostype=pc-windows-gnu - ;; - Haiku) - _ostype=unknown-haiku - ;; - - *) - err "unknown value from uname -s: $_uname_value" - ;; - esac - - RETVAL="$_ostype" -} - uninstall_legacy() { local _abs_libdir="$1" @@ -675,11 +619,13 @@ maybe_backup_path "$_file_install_path" - if echo "$_file" | grep "^bin/" > /dev/null + if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" then - run install -m755 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" else - run install -m644 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 644 "$_file_install_path" fi critical_need_ok "file creation failed" @@ -719,11 +665,10 @@ maybe_configure_ld() { local _abs_libdir="$1" - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" = "unknown-linux-gnu" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then + if [ "$_ostype" = "Linux" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then # Fedora-based systems do not configure the dynamic linker to look # /usr/local/lib, which is our default installation directory. To @@ -756,11 +701,10 @@ } maybe_unconfigure_ld() { - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" != "unknown-linux-gnu" ]; then + if [ "$_ostype" != "Linux" ]; then return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/version new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/version --- old/cargo-0.22.0-armv7-unknown-linux-gnueabihf/version 2017-10-09 23:41:13.000000000 +0200 +++ new/cargo-0.23.0-armv7-unknown-linux-gnueabihf/version 2017-11-23 00:16:49.000000000 +0100 @@ -1 +1 @@ -0.22.0 (3423351a5 2017-10-06) \ No newline at end of file +0.23.0 (61fa02415 2017-11-22) \ No newline at end of file ++++++ cargo-0.22.0-i686-unknown-linux-gnu.tar.gz -> cargo-0.23.0-i686-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-i686-unknown-linux-gnu/README.md new/cargo-0.23.0-i686-unknown-linux-gnu/README.md --- old/cargo-0.22.0-i686-unknown-linux-gnu/README.md 2017-10-10 00:04:10.000000000 +0200 +++ new/cargo-0.23.0-i686-unknown-linux-gnu/README.md 2017-11-23 00:48:54.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license Binary files old/cargo-0.22.0-i686-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.23.0-i686-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-i686-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.23.0-i686-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.22.0-i686-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-10-10 00:04:10.000000000 +0200 +++ new/cargo-0.23.0-i686-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-11-23 00:48:54.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-i686-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 new/cargo-0.23.0-i686-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 --- old/cargo-0.22.0-i686-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-10-10 00:04:10.000000000 +0200 +++ new/cargo-0.23.0-i686-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-11-23 00:48:54.000000000 +0100 @@ -43,7 +43,7 @@ .RE .SH EXAMPLES .PP -Retrive package specification for foo package +Retrieve package specification for foo package .IP .nf \f[C] @@ -59,7 +59,7 @@ \f[] .fi .PP -Retrive package specification for foo from crates.io +Retrieve package specification for foo from crates.io .IP .nf \f[C] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-i686-unknown-linux-gnu/cargo/share/man/man1/cargo.1 new/cargo-0.23.0-i686-unknown-linux-gnu/cargo/share/man/man1/cargo.1 --- old/cargo-0.22.0-i686-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-10-10 00:04:10.000000000 +0200 +++ new/cargo-0.23.0-i686-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-11-23 00:48:54.000000000 +0100 @@ -96,6 +96,11 @@ .RS .RE .TP +.B cargo\-rustc(1) +Compile the current project, and optionally pass additional rustc parameters +.RS +.RE +.TP .B cargo\-package(1) Generate a source tarball for the current package. .RS @@ -121,6 +126,11 @@ .RS .RE .TP +.B cargo\-help(1) +Display help for a cargo command +.RS +.RE +.TP .B cargo\-version(1) Print cargo\[aq]s version and exit. .RS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-i686-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo new/cargo-0.23.0-i686-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo --- old/cargo-0.22.0-i686-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-10-10 00:04:10.000000000 +0200 +++ new/cargo-0.23.0-i686-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-11-23 00:48:54.000000000 +0100 @@ -1,19 +1,29 @@ #compdef cargo -typeset -A opt_args autoload -U regexp-replace zstyle -T ':completion:*:*:cargo:*' tag-order && \ zstyle ':completion:*:*:cargo:*' tag-order 'common-commands' _cargo() { +local context state state_descr line +typeset -A opt_args +# leading items in parentheses are an exclusion list for the arguments following that arg +# See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Fu… +# - => exclude all other options +# 1 => exclude positional arg 1 +# * => exclude all other args +# +blah => exclude +blah _arguments \ '(- 1 *)'{-h,--help}'[show help message]' \ - '(- 1 *)'--list'[list installed commands]' \ - '(- 1 *)'{-v,--verbose}'[use verbose output]' \ - '(- 1 *)'--color'[colorization option]' \ + '(- 1 *)--list[list installed commands]' \ '(- 1 *)'{-V,--version}'[show version information]' \ + {-v,--verbose}'[use verbose output]' \ + --color'[colorization option]' \ + '(+beta +nightly)+stable[use the stable toolchain]' \ + '(+stable +nightly)+beta[use the beta toolchain]' \ + '(+stable +beta)+nightly[use the nightly toolchain]' \ '1: :->command' \ '*:: :->args' @@ -163,10 +173,10 @@ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \ '--no-default-features[do not build the default features]' \ - '--path=[local filesystem path to crate to install]' \ + '--path=[local filesystem path to crate to install]: :_files -/' \ '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \ '--rev=[specific commit to use when installing from git]' \ - '--root=[directory to install packages into]' \ + '--root=[directory to install packages into]: :_files -/' \ '--tag=[tag to use when installing from git]' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ '--vers=[version to install from crates.io]' \ @@ -291,7 +301,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to fetch dependencies for]' \ + '--manifest-path=[path to the manifest to fetch dependencies for]: :_files -/' \ '--no-default-features[do not compile default features for the package]' \ '(-p, --package)'{-p,--package}'=[profile to compile for]' \ '--profile=[profile to build the selected target for]' \ @@ -309,7 +319,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to document]' \ + '--manifest-path=[path to the manifest to document]: :_files -/' \ '--no-default-features[do not build the `default` feature]' \ '--open[open the docs in a browser after the operation]' \ '(-p, --package)'{-p,--package}'=[package to document]' \ @@ -365,7 +375,7 @@ '--color=:colorization option:(auto always never)' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \ - '--root=[directory to uninstall packages from]' \ + '--root=[directory to uninstall packages from]: :_files -/' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ ;; @@ -531,5 +541,4 @@ '(--bench --bin --example --lib)--test=[test name]' ) - _cargo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-i686-unknown-linux-gnu/install.sh new/cargo-0.23.0-i686-unknown-linux-gnu/install.sh --- old/cargo-0.22.0-i686-unknown-linux-gnu/install.sh 2017-10-10 00:04:10.000000000 +0200 +++ new/cargo-0.23.0-i686-unknown-linux-gnu/install.sh 2017-11-23 00:48:54.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2014 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. @@ -319,62 +319,6 @@ (unset CDPATH && cd "$path" > /dev/null && pwd) } -get_host_triple() { - local _uname_value=$(uname -s) - local _ostype - case $_uname_value in - - Linux) - _ostype=unknown-linux-gnu - ;; - - FreeBSD) - _ostype=unknown-freebsd - ;; - - DragonFly) - _ostype=unknown-dragonfly - ;; - - Bitrig) - _ostype=unknown-bitrig - ;; - - NetBSD) - _ostype=unknown-netbsd - ;; - - OpenBSD) - _ostype=unknown-openbsd - ;; - - Darwin) - _ostype=apple-darwin - ;; - - MINGW*) - _ostype=pc-windows-gnu - ;; - - MSYS*) - _ostype=pc-windows-gnu - ;; - - CYGWIN*) - _ostype=pc-windows-gnu - ;; - Haiku) - _ostype=unknown-haiku - ;; - - *) - err "unknown value from uname -s: $_uname_value" - ;; - esac - - RETVAL="$_ostype" -} - uninstall_legacy() { local _abs_libdir="$1" @@ -675,11 +619,13 @@ maybe_backup_path "$_file_install_path" - if echo "$_file" | grep "^bin/" > /dev/null + if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" then - run install -m755 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" else - run install -m644 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 644 "$_file_install_path" fi critical_need_ok "file creation failed" @@ -719,11 +665,10 @@ maybe_configure_ld() { local _abs_libdir="$1" - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" = "unknown-linux-gnu" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then + if [ "$_ostype" = "Linux" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then # Fedora-based systems do not configure the dynamic linker to look # /usr/local/lib, which is our default installation directory. To @@ -756,11 +701,10 @@ } maybe_unconfigure_ld() { - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" != "unknown-linux-gnu" ]; then + if [ "$_ostype" != "Linux" ]; then return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-i686-unknown-linux-gnu/version new/cargo-0.23.0-i686-unknown-linux-gnu/version --- old/cargo-0.22.0-i686-unknown-linux-gnu/version 2017-10-10 00:04:10.000000000 +0200 +++ new/cargo-0.23.0-i686-unknown-linux-gnu/version 2017-11-23 00:48:54.000000000 +0100 @@ -1 +1 @@ -0.22.0 (3423351a5 2017-10-06) \ No newline at end of file +0.23.0 (61fa02415 2017-11-22) \ No newline at end of file ++++++ cargo-0.22.0-powerpc64-unknown-linux-gnu.tar.gz -> cargo-0.23.0-powerpc64-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64-unknown-linux-gnu/README.md new/cargo-0.23.0-powerpc64-unknown-linux-gnu/README.md --- old/cargo-0.22.0-powerpc64-unknown-linux-gnu/README.md 2017-10-10 00:15:22.000000000 +0200 +++ new/cargo-0.23.0-powerpc64-unknown-linux-gnu/README.md 2017-11-23 00:22:18.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license Binary files old/cargo-0.22.0-powerpc64-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.23.0-powerpc64-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.23.0-powerpc64-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.22.0-powerpc64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-10-10 00:15:22.000000000 +0200 +++ new/cargo-0.23.0-powerpc64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-11-23 00:22:18.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 new/cargo-0.23.0-powerpc64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 --- old/cargo-0.22.0-powerpc64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-10-10 00:15:22.000000000 +0200 +++ new/cargo-0.23.0-powerpc64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-11-23 00:22:18.000000000 +0100 @@ -43,7 +43,7 @@ .RE .SH EXAMPLES .PP -Retrive package specification for foo package +Retrieve package specification for foo package .IP .nf \f[C] @@ -59,7 +59,7 @@ \f[] .fi .PP -Retrive package specification for foo from crates.io +Retrieve package specification for foo from crates.io .IP .nf \f[C] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 new/cargo-0.23.0-powerpc64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 --- old/cargo-0.22.0-powerpc64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-10-10 00:15:22.000000000 +0200 +++ new/cargo-0.23.0-powerpc64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-11-23 00:22:18.000000000 +0100 @@ -96,6 +96,11 @@ .RS .RE .TP +.B cargo\-rustc(1) +Compile the current project, and optionally pass additional rustc parameters +.RS +.RE +.TP .B cargo\-package(1) Generate a source tarball for the current package. .RS @@ -121,6 +126,11 @@ .RS .RE .TP +.B cargo\-help(1) +Display help for a cargo command +.RS +.RE +.TP .B cargo\-version(1) Print cargo\[aq]s version and exit. .RS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo new/cargo-0.23.0-powerpc64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo --- old/cargo-0.22.0-powerpc64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-10-10 00:15:22.000000000 +0200 +++ new/cargo-0.23.0-powerpc64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-11-23 00:22:18.000000000 +0100 @@ -1,19 +1,29 @@ #compdef cargo -typeset -A opt_args autoload -U regexp-replace zstyle -T ':completion:*:*:cargo:*' tag-order && \ zstyle ':completion:*:*:cargo:*' tag-order 'common-commands' _cargo() { +local context state state_descr line +typeset -A opt_args +# leading items in parentheses are an exclusion list for the arguments following that arg +# See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Fu… +# - => exclude all other options +# 1 => exclude positional arg 1 +# * => exclude all other args +# +blah => exclude +blah _arguments \ '(- 1 *)'{-h,--help}'[show help message]' \ - '(- 1 *)'--list'[list installed commands]' \ - '(- 1 *)'{-v,--verbose}'[use verbose output]' \ - '(- 1 *)'--color'[colorization option]' \ + '(- 1 *)--list[list installed commands]' \ '(- 1 *)'{-V,--version}'[show version information]' \ + {-v,--verbose}'[use verbose output]' \ + --color'[colorization option]' \ + '(+beta +nightly)+stable[use the stable toolchain]' \ + '(+stable +nightly)+beta[use the beta toolchain]' \ + '(+stable +beta)+nightly[use the nightly toolchain]' \ '1: :->command' \ '*:: :->args' @@ -163,10 +173,10 @@ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \ '--no-default-features[do not build the default features]' \ - '--path=[local filesystem path to crate to install]' \ + '--path=[local filesystem path to crate to install]: :_files -/' \ '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \ '--rev=[specific commit to use when installing from git]' \ - '--root=[directory to install packages into]' \ + '--root=[directory to install packages into]: :_files -/' \ '--tag=[tag to use when installing from git]' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ '--vers=[version to install from crates.io]' \ @@ -291,7 +301,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to fetch dependencies for]' \ + '--manifest-path=[path to the manifest to fetch dependencies for]: :_files -/' \ '--no-default-features[do not compile default features for the package]' \ '(-p, --package)'{-p,--package}'=[profile to compile for]' \ '--profile=[profile to build the selected target for]' \ @@ -309,7 +319,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to document]' \ + '--manifest-path=[path to the manifest to document]: :_files -/' \ '--no-default-features[do not build the `default` feature]' \ '--open[open the docs in a browser after the operation]' \ '(-p, --package)'{-p,--package}'=[package to document]' \ @@ -365,7 +375,7 @@ '--color=:colorization option:(auto always never)' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \ - '--root=[directory to uninstall packages from]' \ + '--root=[directory to uninstall packages from]: :_files -/' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ ;; @@ -531,5 +541,4 @@ '(--bench --bin --example --lib)--test=[test name]' ) - _cargo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64-unknown-linux-gnu/install.sh new/cargo-0.23.0-powerpc64-unknown-linux-gnu/install.sh --- old/cargo-0.22.0-powerpc64-unknown-linux-gnu/install.sh 2017-10-10 00:15:22.000000000 +0200 +++ new/cargo-0.23.0-powerpc64-unknown-linux-gnu/install.sh 2017-11-23 00:22:18.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2014 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. @@ -319,62 +319,6 @@ (unset CDPATH && cd "$path" > /dev/null && pwd) } -get_host_triple() { - local _uname_value=$(uname -s) - local _ostype - case $_uname_value in - - Linux) - _ostype=unknown-linux-gnu - ;; - - FreeBSD) - _ostype=unknown-freebsd - ;; - - DragonFly) - _ostype=unknown-dragonfly - ;; - - Bitrig) - _ostype=unknown-bitrig - ;; - - NetBSD) - _ostype=unknown-netbsd - ;; - - OpenBSD) - _ostype=unknown-openbsd - ;; - - Darwin) - _ostype=apple-darwin - ;; - - MINGW*) - _ostype=pc-windows-gnu - ;; - - MSYS*) - _ostype=pc-windows-gnu - ;; - - CYGWIN*) - _ostype=pc-windows-gnu - ;; - Haiku) - _ostype=unknown-haiku - ;; - - *) - err "unknown value from uname -s: $_uname_value" - ;; - esac - - RETVAL="$_ostype" -} - uninstall_legacy() { local _abs_libdir="$1" @@ -675,11 +619,13 @@ maybe_backup_path "$_file_install_path" - if echo "$_file" | grep "^bin/" > /dev/null + if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" then - run install -m755 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" else - run install -m644 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 644 "$_file_install_path" fi critical_need_ok "file creation failed" @@ -719,11 +665,10 @@ maybe_configure_ld() { local _abs_libdir="$1" - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" = "unknown-linux-gnu" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then + if [ "$_ostype" = "Linux" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then # Fedora-based systems do not configure the dynamic linker to look # /usr/local/lib, which is our default installation directory. To @@ -756,11 +701,10 @@ } maybe_unconfigure_ld() { - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" != "unknown-linux-gnu" ]; then + if [ "$_ostype" != "Linux" ]; then return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64-unknown-linux-gnu/version new/cargo-0.23.0-powerpc64-unknown-linux-gnu/version --- old/cargo-0.22.0-powerpc64-unknown-linux-gnu/version 2017-10-10 00:15:22.000000000 +0200 +++ new/cargo-0.23.0-powerpc64-unknown-linux-gnu/version 2017-11-23 00:22:18.000000000 +0100 @@ -1 +1 @@ -0.22.0 (3423351a5 2017-10-06) \ No newline at end of file +0.23.0 (61fa02415 2017-11-22) \ No newline at end of file ++++++ cargo-0.22.0-powerpc64le-unknown-linux-gnu.tar.gz -> cargo-0.23.0-powerpc64le-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/README.md new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/README.md --- old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/README.md 2017-10-09 23:53:47.000000000 +0200 +++ new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/README.md 2017-11-23 00:10:25.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license Binary files old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-10-09 23:53:47.000000000 +0200 +++ new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-11-23 00:10:25.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 --- old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-10-09 23:53:47.000000000 +0200 +++ new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-11-23 00:10:25.000000000 +0100 @@ -43,7 +43,7 @@ .RE .SH EXAMPLES .PP -Retrive package specification for foo package +Retrieve package specification for foo package .IP .nf \f[C] @@ -59,7 +59,7 @@ \f[] .fi .PP -Retrive package specification for foo from crates.io +Retrieve package specification for foo from crates.io .IP .nf \f[C] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/cargo/share/man/man1/cargo.1 new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/cargo/share/man/man1/cargo.1 --- old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-10-09 23:53:47.000000000 +0200 +++ new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-11-23 00:10:25.000000000 +0100 @@ -96,6 +96,11 @@ .RS .RE .TP +.B cargo\-rustc(1) +Compile the current project, and optionally pass additional rustc parameters +.RS +.RE +.TP .B cargo\-package(1) Generate a source tarball for the current package. .RS @@ -121,6 +126,11 @@ .RS .RE .TP +.B cargo\-help(1) +Display help for a cargo command +.RS +.RE +.TP .B cargo\-version(1) Print cargo\[aq]s version and exit. .RS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo --- old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-10-09 23:53:47.000000000 +0200 +++ new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-11-23 00:10:25.000000000 +0100 @@ -1,19 +1,29 @@ #compdef cargo -typeset -A opt_args autoload -U regexp-replace zstyle -T ':completion:*:*:cargo:*' tag-order && \ zstyle ':completion:*:*:cargo:*' tag-order 'common-commands' _cargo() { +local context state state_descr line +typeset -A opt_args +# leading items in parentheses are an exclusion list for the arguments following that arg +# See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Fu… +# - => exclude all other options +# 1 => exclude positional arg 1 +# * => exclude all other args +# +blah => exclude +blah _arguments \ '(- 1 *)'{-h,--help}'[show help message]' \ - '(- 1 *)'--list'[list installed commands]' \ - '(- 1 *)'{-v,--verbose}'[use verbose output]' \ - '(- 1 *)'--color'[colorization option]' \ + '(- 1 *)--list[list installed commands]' \ '(- 1 *)'{-V,--version}'[show version information]' \ + {-v,--verbose}'[use verbose output]' \ + --color'[colorization option]' \ + '(+beta +nightly)+stable[use the stable toolchain]' \ + '(+stable +nightly)+beta[use the beta toolchain]' \ + '(+stable +beta)+nightly[use the nightly toolchain]' \ '1: :->command' \ '*:: :->args' @@ -163,10 +173,10 @@ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \ '--no-default-features[do not build the default features]' \ - '--path=[local filesystem path to crate to install]' \ + '--path=[local filesystem path to crate to install]: :_files -/' \ '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \ '--rev=[specific commit to use when installing from git]' \ - '--root=[directory to install packages into]' \ + '--root=[directory to install packages into]: :_files -/' \ '--tag=[tag to use when installing from git]' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ '--vers=[version to install from crates.io]' \ @@ -291,7 +301,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to fetch dependencies for]' \ + '--manifest-path=[path to the manifest to fetch dependencies for]: :_files -/' \ '--no-default-features[do not compile default features for the package]' \ '(-p, --package)'{-p,--package}'=[profile to compile for]' \ '--profile=[profile to build the selected target for]' \ @@ -309,7 +319,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to document]' \ + '--manifest-path=[path to the manifest to document]: :_files -/' \ '--no-default-features[do not build the `default` feature]' \ '--open[open the docs in a browser after the operation]' \ '(-p, --package)'{-p,--package}'=[package to document]' \ @@ -365,7 +375,7 @@ '--color=:colorization option:(auto always never)' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \ - '--root=[directory to uninstall packages from]' \ + '--root=[directory to uninstall packages from]: :_files -/' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ ;; @@ -531,5 +541,4 @@ '(--bench --bin --example --lib)--test=[test name]' ) - _cargo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/install.sh new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/install.sh --- old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/install.sh 2017-10-09 23:53:47.000000000 +0200 +++ new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/install.sh 2017-11-23 00:10:25.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2014 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. @@ -319,62 +319,6 @@ (unset CDPATH && cd "$path" > /dev/null && pwd) } -get_host_triple() { - local _uname_value=$(uname -s) - local _ostype - case $_uname_value in - - Linux) - _ostype=unknown-linux-gnu - ;; - - FreeBSD) - _ostype=unknown-freebsd - ;; - - DragonFly) - _ostype=unknown-dragonfly - ;; - - Bitrig) - _ostype=unknown-bitrig - ;; - - NetBSD) - _ostype=unknown-netbsd - ;; - - OpenBSD) - _ostype=unknown-openbsd - ;; - - Darwin) - _ostype=apple-darwin - ;; - - MINGW*) - _ostype=pc-windows-gnu - ;; - - MSYS*) - _ostype=pc-windows-gnu - ;; - - CYGWIN*) - _ostype=pc-windows-gnu - ;; - Haiku) - _ostype=unknown-haiku - ;; - - *) - err "unknown value from uname -s: $_uname_value" - ;; - esac - - RETVAL="$_ostype" -} - uninstall_legacy() { local _abs_libdir="$1" @@ -675,11 +619,13 @@ maybe_backup_path "$_file_install_path" - if echo "$_file" | grep "^bin/" > /dev/null + if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" then - run install -m755 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" else - run install -m644 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 644 "$_file_install_path" fi critical_need_ok "file creation failed" @@ -719,11 +665,10 @@ maybe_configure_ld() { local _abs_libdir="$1" - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" = "unknown-linux-gnu" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then + if [ "$_ostype" = "Linux" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then # Fedora-based systems do not configure the dynamic linker to look # /usr/local/lib, which is our default installation directory. To @@ -756,11 +701,10 @@ } maybe_unconfigure_ld() { - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" != "unknown-linux-gnu" ]; then + if [ "$_ostype" != "Linux" ]; then return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/version new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/version --- old/cargo-0.22.0-powerpc64le-unknown-linux-gnu/version 2017-10-09 23:53:47.000000000 +0200 +++ new/cargo-0.23.0-powerpc64le-unknown-linux-gnu/version 2017-11-23 00:10:25.000000000 +0100 @@ -1 +1 @@ -0.22.0 (3423351a5 2017-10-06) \ No newline at end of file +0.23.0 (61fa02415 2017-11-22) \ No newline at end of file ++++++ cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz -> cargo-0.23.0-s390x-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-s390x-unknown-linux-gnu/README.md new/cargo-0.23.0-s390x-unknown-linux-gnu/README.md --- old/cargo-0.22.0-s390x-unknown-linux-gnu/README.md 2017-10-09 23:49:45.000000000 +0200 +++ new/cargo-0.23.0-s390x-unknown-linux-gnu/README.md 2017-11-23 00:21:14.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license Binary files old/cargo-0.22.0-s390x-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.23.0-s390x-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-s390x-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.23.0-s390x-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.22.0-s390x-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-10-09 23:49:45.000000000 +0200 +++ new/cargo-0.23.0-s390x-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-11-23 00:21:14.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-s390x-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 new/cargo-0.23.0-s390x-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 --- old/cargo-0.22.0-s390x-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-10-09 23:49:45.000000000 +0200 +++ new/cargo-0.23.0-s390x-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-11-23 00:21:14.000000000 +0100 @@ -43,7 +43,7 @@ .RE .SH EXAMPLES .PP -Retrive package specification for foo package +Retrieve package specification for foo package .IP .nf \f[C] @@ -59,7 +59,7 @@ \f[] .fi .PP -Retrive package specification for foo from crates.io +Retrieve package specification for foo from crates.io .IP .nf \f[C] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-s390x-unknown-linux-gnu/cargo/share/man/man1/cargo.1 new/cargo-0.23.0-s390x-unknown-linux-gnu/cargo/share/man/man1/cargo.1 --- old/cargo-0.22.0-s390x-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-10-09 23:49:45.000000000 +0200 +++ new/cargo-0.23.0-s390x-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-11-23 00:21:14.000000000 +0100 @@ -96,6 +96,11 @@ .RS .RE .TP +.B cargo\-rustc(1) +Compile the current project, and optionally pass additional rustc parameters +.RS +.RE +.TP .B cargo\-package(1) Generate a source tarball for the current package. .RS @@ -121,6 +126,11 @@ .RS .RE .TP +.B cargo\-help(1) +Display help for a cargo command +.RS +.RE +.TP .B cargo\-version(1) Print cargo\[aq]s version and exit. .RS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-s390x-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo new/cargo-0.23.0-s390x-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo --- old/cargo-0.22.0-s390x-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-10-09 23:49:45.000000000 +0200 +++ new/cargo-0.23.0-s390x-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-11-23 00:21:14.000000000 +0100 @@ -1,19 +1,29 @@ #compdef cargo -typeset -A opt_args autoload -U regexp-replace zstyle -T ':completion:*:*:cargo:*' tag-order && \ zstyle ':completion:*:*:cargo:*' tag-order 'common-commands' _cargo() { +local context state state_descr line +typeset -A opt_args +# leading items in parentheses are an exclusion list for the arguments following that arg +# See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Fu… +# - => exclude all other options +# 1 => exclude positional arg 1 +# * => exclude all other args +# +blah => exclude +blah _arguments \ '(- 1 *)'{-h,--help}'[show help message]' \ - '(- 1 *)'--list'[list installed commands]' \ - '(- 1 *)'{-v,--verbose}'[use verbose output]' \ - '(- 1 *)'--color'[colorization option]' \ + '(- 1 *)--list[list installed commands]' \ '(- 1 *)'{-V,--version}'[show version information]' \ + {-v,--verbose}'[use verbose output]' \ + --color'[colorization option]' \ + '(+beta +nightly)+stable[use the stable toolchain]' \ + '(+stable +nightly)+beta[use the beta toolchain]' \ + '(+stable +beta)+nightly[use the nightly toolchain]' \ '1: :->command' \ '*:: :->args' @@ -163,10 +173,10 @@ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \ '--no-default-features[do not build the default features]' \ - '--path=[local filesystem path to crate to install]' \ + '--path=[local filesystem path to crate to install]: :_files -/' \ '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \ '--rev=[specific commit to use when installing from git]' \ - '--root=[directory to install packages into]' \ + '--root=[directory to install packages into]: :_files -/' \ '--tag=[tag to use when installing from git]' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ '--vers=[version to install from crates.io]' \ @@ -291,7 +301,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to fetch dependencies for]' \ + '--manifest-path=[path to the manifest to fetch dependencies for]: :_files -/' \ '--no-default-features[do not compile default features for the package]' \ '(-p, --package)'{-p,--package}'=[profile to compile for]' \ '--profile=[profile to build the selected target for]' \ @@ -309,7 +319,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to document]' \ + '--manifest-path=[path to the manifest to document]: :_files -/' \ '--no-default-features[do not build the `default` feature]' \ '--open[open the docs in a browser after the operation]' \ '(-p, --package)'{-p,--package}'=[package to document]' \ @@ -365,7 +375,7 @@ '--color=:colorization option:(auto always never)' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \ - '--root=[directory to uninstall packages from]' \ + '--root=[directory to uninstall packages from]: :_files -/' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ ;; @@ -531,5 +541,4 @@ '(--bench --bin --example --lib)--test=[test name]' ) - _cargo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-s390x-unknown-linux-gnu/install.sh new/cargo-0.23.0-s390x-unknown-linux-gnu/install.sh --- old/cargo-0.22.0-s390x-unknown-linux-gnu/install.sh 2017-10-09 23:49:45.000000000 +0200 +++ new/cargo-0.23.0-s390x-unknown-linux-gnu/install.sh 2017-11-23 00:21:14.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2014 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. @@ -319,62 +319,6 @@ (unset CDPATH && cd "$path" > /dev/null && pwd) } -get_host_triple() { - local _uname_value=$(uname -s) - local _ostype - case $_uname_value in - - Linux) - _ostype=unknown-linux-gnu - ;; - - FreeBSD) - _ostype=unknown-freebsd - ;; - - DragonFly) - _ostype=unknown-dragonfly - ;; - - Bitrig) - _ostype=unknown-bitrig - ;; - - NetBSD) - _ostype=unknown-netbsd - ;; - - OpenBSD) - _ostype=unknown-openbsd - ;; - - Darwin) - _ostype=apple-darwin - ;; - - MINGW*) - _ostype=pc-windows-gnu - ;; - - MSYS*) - _ostype=pc-windows-gnu - ;; - - CYGWIN*) - _ostype=pc-windows-gnu - ;; - Haiku) - _ostype=unknown-haiku - ;; - - *) - err "unknown value from uname -s: $_uname_value" - ;; - esac - - RETVAL="$_ostype" -} - uninstall_legacy() { local _abs_libdir="$1" @@ -675,11 +619,13 @@ maybe_backup_path "$_file_install_path" - if echo "$_file" | grep "^bin/" > /dev/null + if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" then - run install -m755 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" else - run install -m644 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 644 "$_file_install_path" fi critical_need_ok "file creation failed" @@ -719,11 +665,10 @@ maybe_configure_ld() { local _abs_libdir="$1" - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" = "unknown-linux-gnu" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then + if [ "$_ostype" = "Linux" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then # Fedora-based systems do not configure the dynamic linker to look # /usr/local/lib, which is our default installation directory. To @@ -756,11 +701,10 @@ } maybe_unconfigure_ld() { - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" != "unknown-linux-gnu" ]; then + if [ "$_ostype" != "Linux" ]; then return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-s390x-unknown-linux-gnu/version new/cargo-0.23.0-s390x-unknown-linux-gnu/version --- old/cargo-0.22.0-s390x-unknown-linux-gnu/version 2017-10-09 23:49:45.000000000 +0200 +++ new/cargo-0.23.0-s390x-unknown-linux-gnu/version 2017-11-23 00:21:14.000000000 +0100 @@ -1 +1 @@ -0.22.0 (3423351a5 2017-10-06) \ No newline at end of file +0.23.0 (61fa02415 2017-11-22) \ No newline at end of file ++++++ cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz -> cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-x86_64-unknown-linux-gnu/README.md new/cargo-0.23.0-x86_64-unknown-linux-gnu/README.md --- old/cargo-0.22.0-x86_64-unknown-linux-gnu/README.md 2017-10-09 23:09:06.000000000 +0200 +++ new/cargo-0.23.0-x86_64-unknown-linux-gnu/README.md 2017-11-23 00:25:52.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license Binary files old/cargo-0.22.0-x86_64-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.23.0-x86_64-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-x86_64-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.23.0-x86_64-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.22.0-x86_64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-10-09 23:09:06.000000000 +0200 +++ new/cargo-0.23.0-x86_64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2017-11-23 00:25:52.000000000 +0100 @@ -34,12 +34,6 @@ cargo build --release ``` -## Running the tests - -To run cargo's tests, use `cargo test`. If you do not have the cross-compilers -installed locally, ignore the cross-compile test failures, or disable them by -using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. - ## Adding new subcommands to Cargo Cargo is designed to be extensible with new subcommands without having to modify @@ -48,16 +42,6 @@ [third-party-subcommands]: https://github.com/rust-lang/cargo/wiki/Third-party-cargo-subcommands -## Contributing to the Docs - -To contribute to the docs, all you need to do is change the markdown files in -the `src/doc` directory. To view the rendered version of changes you have -made locally, run: - -```sh -sh src/ci/dox.sh -open target/doc/index.html -``` ## Releases @@ -66,28 +50,7 @@ [rel]: https://github.com/rust-lang/rust/blob/master/RELEASES.md -<details> - <summary>Table of Rust versions with their Cargo versions</summary> - -Rust version | Cargo version --------------|--------------| - 1.12.0 | 0.13.0 | - 1.11.0 | 0.12.0 | - 1.10.0 | 0.11.0 | - 1.9.0 | 0.10.0 | - 1.8.0 | 0.9.0 | - 1.7.0 | 0.8.0 | - 1.6.0 | 0.7.0 | - 1.5.0 | 0.6.0 | - 1.4.0 | 0.5.0 | - 1.3.0 | 0.4.0 | - 1.2.0 | 0.3.0 | - 1.1.0 | 0.2.0 | - 1.0.0 | 0.1.0 | - -</details> - -## Reporting Issues +## Reporting issues Found a bug? We'd love to know about it! @@ -95,6 +58,12 @@ [issues]: https://github.com/rust-lang/cargo/issues + +## Contributing + +See [CONTRIBUTING.md](CONTRIBUTING.md) + + ## License Cargo is primarily distributed under the terms of both the MIT license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-x86_64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 new/cargo-0.23.0-x86_64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 --- old/cargo-0.22.0-x86_64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-10-09 23:09:06.000000000 +0200 +++ new/cargo-0.23.0-x86_64-unknown-linux-gnu/cargo/share/man/man1/cargo-pkgid.1 2017-11-23 00:25:52.000000000 +0100 @@ -43,7 +43,7 @@ .RE .SH EXAMPLES .PP -Retrive package specification for foo package +Retrieve package specification for foo package .IP .nf \f[C] @@ -59,7 +59,7 @@ \f[] .fi .PP -Retrive package specification for foo from crates.io +Retrieve package specification for foo from crates.io .IP .nf \f[C] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-x86_64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 new/cargo-0.23.0-x86_64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 --- old/cargo-0.22.0-x86_64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-10-09 23:09:06.000000000 +0200 +++ new/cargo-0.23.0-x86_64-unknown-linux-gnu/cargo/share/man/man1/cargo.1 2017-11-23 00:25:52.000000000 +0100 @@ -96,6 +96,11 @@ .RS .RE .TP +.B cargo\-rustc(1) +Compile the current project, and optionally pass additional rustc parameters +.RS +.RE +.TP .B cargo\-package(1) Generate a source tarball for the current package. .RS @@ -121,6 +126,11 @@ .RS .RE .TP +.B cargo\-help(1) +Display help for a cargo command +.RS +.RE +.TP .B cargo\-version(1) Print cargo\[aq]s version and exit. .RS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-x86_64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo new/cargo-0.23.0-x86_64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo --- old/cargo-0.22.0-x86_64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-10-09 23:09:06.000000000 +0200 +++ new/cargo-0.23.0-x86_64-unknown-linux-gnu/cargo/share/zsh/site-functions/_cargo 2017-11-23 00:25:52.000000000 +0100 @@ -1,19 +1,29 @@ #compdef cargo -typeset -A opt_args autoload -U regexp-replace zstyle -T ':completion:*:*:cargo:*' tag-order && \ zstyle ':completion:*:*:cargo:*' tag-order 'common-commands' _cargo() { +local context state state_descr line +typeset -A opt_args +# leading items in parentheses are an exclusion list for the arguments following that arg +# See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Fu… +# - => exclude all other options +# 1 => exclude positional arg 1 +# * => exclude all other args +# +blah => exclude +blah _arguments \ '(- 1 *)'{-h,--help}'[show help message]' \ - '(- 1 *)'--list'[list installed commands]' \ - '(- 1 *)'{-v,--verbose}'[use verbose output]' \ - '(- 1 *)'--color'[colorization option]' \ + '(- 1 *)--list[list installed commands]' \ '(- 1 *)'{-V,--version}'[show version information]' \ + {-v,--verbose}'[use verbose output]' \ + --color'[colorization option]' \ + '(+beta +nightly)+stable[use the stable toolchain]' \ + '(+stable +nightly)+beta[use the beta toolchain]' \ + '(+stable +beta)+nightly[use the nightly toolchain]' \ '1: :->command' \ '*:: :->args' @@ -163,10 +173,10 @@ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'[number of parallel jobs, defaults to # of CPUs]' \ '--no-default-features[do not build the default features]' \ - '--path=[local filesystem path to crate to install]' \ + '--path=[local filesystem path to crate to install]: :_files -/' \ '(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \ '--rev=[specific commit to use when installing from git]' \ - '--root=[directory to install packages into]' \ + '--root=[directory to install packages into]: :_files -/' \ '--tag=[tag to use when installing from git]' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ '--vers=[version to install from crates.io]' \ @@ -291,7 +301,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to fetch dependencies for]' \ + '--manifest-path=[path to the manifest to fetch dependencies for]: :_files -/' \ '--no-default-features[do not compile default features for the package]' \ '(-p, --package)'{-p,--package}'=[profile to compile for]' \ '--profile=[profile to build the selected target for]' \ @@ -309,7 +319,7 @@ '--all-features[enable all available features]' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-j, --jobs)'{-j,--jobs}'=[number of parallel jobs, defaults to # of CPUs]' \ - '--manifest-path=[path to the manifest to document]' \ + '--manifest-path=[path to the manifest to document]: :_files -/' \ '--no-default-features[do not build the `default` feature]' \ '--open[open the docs in a browser after the operation]' \ '(-p, --package)'{-p,--package}'=[package to document]' \ @@ -365,7 +375,7 @@ '--color=:colorization option:(auto always never)' \ '(-h, --help)'{-h,--help}'[show help message]' \ '(-q, --quiet)'{-q,--quiet}'[less output printed to stdout]' \ - '--root=[directory to uninstall packages from]' \ + '--root=[directory to uninstall packages from]: :_files -/' \ '(-v, --verbose)'{-v,--verbose}'[use verbose output]' \ ;; @@ -531,5 +541,4 @@ '(--bench --bin --example --lib)--test=[test name]' ) - _cargo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-x86_64-unknown-linux-gnu/install.sh new/cargo-0.23.0-x86_64-unknown-linux-gnu/install.sh --- old/cargo-0.22.0-x86_64-unknown-linux-gnu/install.sh 2017-10-09 23:09:06.000000000 +0200 +++ new/cargo-0.23.0-x86_64-unknown-linux-gnu/install.sh 2017-11-23 00:25:52.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2014 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. @@ -319,62 +319,6 @@ (unset CDPATH && cd "$path" > /dev/null && pwd) } -get_host_triple() { - local _uname_value=$(uname -s) - local _ostype - case $_uname_value in - - Linux) - _ostype=unknown-linux-gnu - ;; - - FreeBSD) - _ostype=unknown-freebsd - ;; - - DragonFly) - _ostype=unknown-dragonfly - ;; - - Bitrig) - _ostype=unknown-bitrig - ;; - - NetBSD) - _ostype=unknown-netbsd - ;; - - OpenBSD) - _ostype=unknown-openbsd - ;; - - Darwin) - _ostype=apple-darwin - ;; - - MINGW*) - _ostype=pc-windows-gnu - ;; - - MSYS*) - _ostype=pc-windows-gnu - ;; - - CYGWIN*) - _ostype=pc-windows-gnu - ;; - Haiku) - _ostype=unknown-haiku - ;; - - *) - err "unknown value from uname -s: $_uname_value" - ;; - esac - - RETVAL="$_ostype" -} - uninstall_legacy() { local _abs_libdir="$1" @@ -675,11 +619,13 @@ maybe_backup_path "$_file_install_path" - if echo "$_file" | grep "^bin/" > /dev/null + if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" then - run install -m755 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" else - run install -m644 "$_src_dir/$_component/$_file" "$_file_install_path" + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 644 "$_file_install_path" fi critical_need_ok "file creation failed" @@ -719,11 +665,10 @@ maybe_configure_ld() { local _abs_libdir="$1" - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" = "unknown-linux-gnu" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then + if [ "$_ostype" = "Linux" -a ! -n "${CFG_DISABLE_LDCONFIG-}" ]; then # Fedora-based systems do not configure the dynamic linker to look # /usr/local/lib, which is our default installation directory. To @@ -756,11 +701,10 @@ } maybe_unconfigure_ld() { - get_host_triple - local _ostype="$RETVAL" + local _ostype="$(uname -s)" assert_nz "$_ostype" "ostype" - if [ "$_ostype" != "unknown-linux-gnu" ]; then + if [ "$_ostype" != "Linux" ]; then return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.22.0-x86_64-unknown-linux-gnu/version new/cargo-0.23.0-x86_64-unknown-linux-gnu/version --- old/cargo-0.22.0-x86_64-unknown-linux-gnu/version 2017-10-09 23:09:06.000000000 +0200 +++ new/cargo-0.23.0-x86_64-unknown-linux-gnu/version 2017-11-23 00:25:52.000000000 +0100 @@ -1 +1 @@ -0.22.0 (3423351a5 2017-10-06) \ No newline at end of file +0.23.0 (61fa02415 2017-11-22) \ No newline at end of file ++++++ config.toml ++++++ --- /var/tmp/diff_new_pack.LnHBIe/_old 2017-11-30 12:43:47.777398112 +0100 +++ /var/tmp/diff_new_pack.LnHBIe/_new 2017-11-30 12:43:47.777398112 +0100 @@ -122,7 +122,7 @@ #extended = false # Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose -verbose = 0 +verbose = 1 # Build the sanitizer runtimes #sanitizers = false ++++++ rustc-1.21.0-src.tar.gz -> rustc-1.22.1-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/rust/rustc-1.21.0-src.tar.gz /work/SRC/openSUSE:Factory/.rust.new/rustc-1.22.1-src.tar.gz differ: char 10, line 1

1 0