|
[-]
[+]
|
Changed |
_service:tar_git:sfos-upgrade.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/Olf0/sfos-upgrade.git</param>
<param name="branch">master</param>
- <param name="revision">3.8.0</param>
+ <param name="revision">3.8.2</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:sfos-upgrade-3.8.2.tar.gz/LICENSE
^
|
| @@ -1,21 +1,493 @@
-MIT License
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
-Copyright (c) 2019 olf
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
|
|
[-]
[+]
|
Changed |
_service:tar_git:sfos-upgrade-3.8.2.tar.gz/usr/bin/post_sfos-upgrade
^
|
| @@ -1,9 +1,9 @@
#!/bin/sh
set -ufC
-export LANG="C" # Engineering English only
-export LC_CTYPE="POSIX"
-export LC_COLLATE="POSIX"
+export LANG=C # Engineering English only
+export LC_CTYPE=POSIX
+export LC_COLLATE=POSIX
called="$(basename "$0")"
if ! echo " $(id -un) $(id -Gn) " | fgrep -q ' root '
|
|
[-]
[+]
|
Changed |
_service:tar_git:sfos-upgrade-3.8.2.tar.gz/usr/bin/sfos-upgrade
^
|
| @@ -1,14 +1,20 @@
#!/bin/bash
-set -euC -o posix # Omitting -f (aka -o noglob), because bash 3.2.57(1)-release does not perform a set +f (or +o noglob; plus setopt is not built-in) correctly, which would be needed later!
+set -euC # Omitting -f (aka -o noglob), because bash 3.2.57(1)-release does not perform a set +f (or +o noglob; plus setopt is not built-in) correctly, which would be needed later!
# Switched to use bash since version 2.1 of this script (in its first line), as this ensures that "-o pipefail"
-# (in line 633) is available, after checking that bash seems to be present in mer-core at least since 2011-10-04
+# (in line 639) is available, after checking that bash seems to be present in mer-core at least since 2011-10-04
# (see https://git.sailfishos.org/mer-core/bash / https://git.merproject.org/mer-core/bash ) and consequently in
# SailfishOS since its beginnings (checked v1.0.0.5 per
# curl https://releases.sailfishos.org/sources/sailfish-1.0.0.5-oss.tar.bz2 | tar -tv | fgrep 'bash' , as no earlier
# released version is available there, e.g. the first ones at https://coderus.openrepos.net/whitesoft/sailversion ).
-# In (at least) recent SailfishOS releases /bin/sh is just a symbolic link to /bin/bash anyway, but have not checked
-# that for ancient releases (which might be re-deployed after a "factory reset").
+# In SailfishOS releases before 4.0, /bin/sh is just a symbolic link to /bin/bash anyway; though I have not checked
+# that for ancient releases (which might be re-deployed after a "factory reset"), likely SailfishOS inherited that
+# from Fedora, via MeeGo and Mer (MeeGo reconstructed), too (i.e., in addition to the presence of bash by default).
+# Per SailfishOS 4.0, busybox's variant of ash has become the shell installed by default, which provides some
+# bash compatibility when called via its bash-symlink (which is deployed by the busybox-symlinks-bash RPM),
+# including "-o pipefail" (hurray!). But not "-o posix" (which was used to guarantee shell behaviour as defined
+# by POSIX up to sfos-upgrade 3.8.1), which hopefully causes no difference in the behaviour of bash-3.2, bash-5 and
+# a 2020s busybox-ash (because any one of these may be installed).
# Nevertheless, this script is still a Bourne (not-"Again") Shell script and stays free of bashisms.
# Exit codes:
@@ -24,9 +30,9 @@
# 23 "Should never be reached" *) case #2
# 42 "Should never be reached" *) case #3
-export LANG="C" # Engineering English only
-export LC_CTYPE="POSIX"
-export LC_COLLATE="POSIX"
+export LANG=C # Engineering English only
+export LC_CTYPE=POSIX
+export LC_COLLATE=POSIX
askyes ()
{
@@ -128,7 +134,7 @@
exit 2
;;
*)
- echo "Aborting: Incorrect option or version format \"${upgrade_release}\" provided." >&2
+ echo "Aborting: Incorrect option or version format \"${upgrade_release}\" provided!" >&2
echo "For a brief usage description, see: $called --help" >&2
exit 3
;;
@@ -180,7 +186,7 @@
if [ "$installed_release" = "$upgrade_release" ]
then compar0="e4"
else
- known_stop_releases="3.4.0.24\n3.2.0.12\n3.0.0.8\n2.2.0.29\n2.0.5.6\n2.0.0.10\n1.1.9.30\n1.1.7.28\n1.1.2.16\n1.0.2.5\n1.0.0.5"
+ known_stop_releases="4.0.1.48,3.4.0.24,3.2.0.12,3.0.0.8,2.2.0.29,2.0.5.6,2.0.0.10,1.1.9.30,1.1.7.28,1.1.2.16,1.0.2.5,1.0.0.5"
# 0.99.5.11, 1.0.0.5 and 1.0.1.10 are not documented to be "stop releases",
# taking the information of sections 4 and 5 (in combination!) at
# https://jolla.zendesk.com/hc/en-us/articles/201836347#4 into account.
@@ -205,7 +211,7 @@
# askyes >&2
# echo >&2
#fi
- all_stop_releases="$(echo -e "${recent_stop_releases}\n$known_stop_releases" | grep -v '^$' | sort -u)"
+ all_stop_releases="$(echo -e "${recent_stop_releases}\n$(echo "$known_stop_releases" | tr ',' '\n')" | grep -v '^$' | sort -u)"
compar0="$(compare_versions "$installed_release" "$upgrade_release")"
case "$compar0" in
e?) # Equality
@@ -620,7 +626,7 @@
askyes >&2
echo >&2
-logfile="/var/log/systemupdate_${upgrade_release}-from-${installed_release}_$(date +'%F_%H-%M-%S').log-dupes.txt"
+logfile="/var/log/systemupdate_${upgrade_release}-from-${installed_release}_$(date +'%Ft%H-%M-%S').log-dupes.txt"
if ! touch "$logfile"
then
echo "Aborting: Failed to create logfile!" >&2
|
|
[-]
[+]
|
Changed |
_service:tar_git:sfos-upgrade-3.8.2.tar.gz/usr/bin/tidy_log-dupes
^
|
| @@ -10,9 +10,9 @@
# 124 : Error parsing parameters
# 126 : Help called
-export LANG="C" # Engineering English only
-export LC_CTYPE="POSIX"
-export LC_COLLATE="POSIX"
+export LANG=C # Engineering English only
+export LC_CTYPE=POSIX
+export LC_COLLATE=POSIX
called="$(basename "$0")"
retc=0
@@ -59,7 +59,7 @@
do
if [ "$logfile" != "$targets" ]
then
- echo -n "$logfile"
+ echo -n "- $logfile"
logs_count="$(expr "$logs_count" '+' "1")"
tidied_log="$(echo "$logfile" | rev | cut -f 2- -d '-' | rev).txt"
if sed 's/\cM//g' "$logfile" | sed 's/Installing: [0-9][0-9]*%\x1b\[K//g' | sed 's/\x1b\[K/\n/g' | sed 's/^\[[0-9][0-9]* %] //g' | sed 's/: \[[0-9][0-9]* %]$//g' | sed 's/: [0-9][0-9]*%$//g' | uniq 2> /dev/null > "$tidied_log"
|
