Hans-Christoph Steiner
797003f9c6
Merge branch 'lint-allow-beerware-xskat' into 'master'
...
lint: allow Beerware and XSkat licenses
See merge request fdroid/fdroidserver!684
2019-10-07 11:26:34 +00:00
Hans-Christoph Steiner
a72904ee23
lint: allow Beerware and XSkat licenses
...
These licenses were already in our repo. The are not FSF- or OSI-approved,
but they are included in Debian. So for now at least, we should maintain
them in our list until we have a clearer picture of how we should make the
list of licenses we support.
* fdroidserver!682
* https://github.com/spdx/license-list-XML/issues/876
* Beerware in Debian:
https://metadata.ftp-master.debian.org/changelogs//main/libm/libmd/libmd_1.0.1-3_copyright
* XSkat in Debian:
https://metadata.ftp-master.debian.org/changelogs//main/x/xskat/xskat_4.0-7_copyright
2019-10-07 12:05:37 +02:00
Hans-Christoph Steiner
f8c954d89e
Merge branch 'lint-url-improvements' into 'master'
...
Lint URL improvements
See merge request fdroid/fdroidserver!681
2019-10-07 08:36:18 +00:00
Hans-Christoph Steiner
5904aef5a7
update: parse Triple-T v2.x layout
...
Thanks to the very nice example from Piwigo, included here under the GPLv3+
https://github.com/Piwigo/Piwigo-Android
https://gitlab.com/fdroid/fdroiddata/merge_requests/5579#note_225834868
2019-10-04 14:11:40 +02:00
Hans-Christoph Steiner
a7dd7a812f
update: strip leading/tailing whitespace on author contact fields
...
Whitespace is not valid in email addresses, URLs, or phone numbers, and the
triple-t/fastlane file format generally has a newline at the end.
2019-10-04 11:33:39 +02:00
Hans-Christoph Steiner
1ef4f74aff
lint: include MIT-CMU, it is so close to FSF/OSI-free MIT
...
fdroidserver!682
https://github.com/spdx/license-list-data/issues/53
* FSF lists two closely related variants as X11 or Expat, search for "MIT license" in https://www.gnu.org/licenses/license-list.html
* X11 is considered free: https://directory.fsf.org/wiki/License:X11
* Expat is considered free: https://directory.fsf.org/wiki/License:Expat
* It is included in Debian, so it is DFSG-free: https://metadata.ftp-master.debian.org/changelogs//main/f/flite/flite_2.1-release-3_copyright
* Fedora considers it free https://fedoraproject.org/wiki/Licensing:MIT#CMU_Style
2019-10-04 11:30:24 +02:00
Hans-Christoph Steiner
3801db064a
lint: improve HTTPS check
...
It was missing some domains, so I added another rule. @IzzySoft pointed
out it was redudnant, so this removes the redudant rule and fixes the
original.
https://gitlab.com/fdroid/fdroidserver/merge_requests/681/diffs#note_225263464
2019-10-04 11:12:48 +02:00
Hans-Christoph Steiner
a8b7342e4c
jenkins-build-all: enable deploy_process_logs for CI test
...
fdroidserver!515
2019-10-04 11:12:48 +02:00
Hans-Christoph Steiner
af4e231f7d
lint: enforce HTTPS on GitHub and GitLab pages
...
The always provide HTTPS, so let's enforce it.
2019-10-04 11:12:48 +02:00
Hans-Christoph Steiner
17320c23f4
lint: don't trip up on projects with 'master' in the name
...
https://gitlab.com/fdroid/fdroiddata/merge_requests/5557#note_223283359
2019-10-04 11:12:48 +02:00
Hans-Christoph Steiner
17f37414db
Merge branch 'license-overhaul-2' into 'master'
...
license overhaul: require FSF or OSI approved license + add override option for default license white-list
See merge request fdroid/fdroidserver!682
2019-10-03 22:01:07 +00:00
Michael Pöhn
d5ab303d83
lint: license override config option + require FSF/OSI approved licenses by default
2019-10-02 22:14:09 +02:00
Michael Pöhn
3c9535d64b
lint: fsf approved licenses only
2019-10-02 12:15:02 +02:00
Michael Pöhn
0963da9fd3
Merge branch 'bugly' into 'master'
...
scanner: blacklist Bugly
See merge request fdroid/fdroidserver!680
2019-09-28 07:59:52 +00:00
relan
bd96a17ef2
scanner: blacklist Bugly
...
The artifact is licensed under "The Bugly Software License, Version 1.0"
[1], but link to the full text [2] is broken. LICENSE file in the source
code repository is empty.
I guess this library is non-free.
[1] https://mvnrepository.com/artifact/com.tencent.bugly/crashreport/2.8.6.0
[2] http://bugly.qq.com/licenses/LICENSE-1.0.txt
[3] https://github.com/BuglyDevTeam/Bugly-Android
2019-09-28 07:58:19 +03:00
Hans-Christoph Steiner
f331db1b22
Merge branch 'master' into 'master'
...
update: log errors on bad graphics, and then ignore the file
See merge request fdroid/fdroidserver!679
2019-09-26 20:29:30 +00:00
Hans-Christoph Steiner
c7048f2c39
update: log errors on bad graphics, and then ignore the file
...
Python PIL is not so tolerant, so bad EXIF causes crashes:
File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 2088, in main
insert_localized_app_metadata(apps)
File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 978, in insert_localized_app_metadata
_strip_and_copy_image(os.path.join(root, f), destdir)
File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 754, in _strip_and_copy_image
in_image = Image.open(fp)
File "/usr/lib/python3/dist-packages/PIL/Image.py", line 2687, in open
% (filename if filename else fp))
OSError: cannot identify image file <_io.BufferedReader name='build/org.sw24softwares.starkeverben/fastlane/metadata/android/en-US/images/featureGraphic.png'>
2019-09-26 22:06:21 +02:00
Hans-Christoph Steiner
c738ad54ec
jenkins-test: only use APKs that'll never be in fdroiddata
2019-09-25 14:36:10 +02:00
Hans-Christoph Steiner
4190481142
jenkins-test: make source APK source exists
2019-09-25 12:41:07 +02:00
Hans-Christoph Steiner
cf2c1d0270
run-tests needs a source of APKs to function
...
The test runs on jenkins.debian.net were failing because they
specified a dir that did not exist.
2019-09-25 12:25:39 +02:00
Hans-Christoph Steiner
ebb8a6bf30
Merge branch 'ci-maintenance' into 'master'
...
CI maintenance
See merge request fdroid/fdroidserver!677
2019-09-23 10:38:15 +00:00
Hans-Christoph Steiner
8d3512763d
gitlab-ci: use a template for a complete apt CI setup
...
# Conflicts:
# .gitlab-ci.yml
2019-09-23 11:50:51 +02:00
Hans-Christoph Steiner
0e40387805
gitlab-ci: switch debian/testing back to pure testing, no sid
...
The sid packages were needed as a temporary workaround while the new
androguard packages were settling into Debian.
2019-09-23 11:33:00 +02:00
Hans-Christoph Steiner
9b5f452f5d
switch official Travis test badge back to https://github.com/f-droid
...
The repos in this group are now setup as mirrors.
2019-09-23 11:32:58 +02:00
Hans-Christoph Steiner
7142a3b89f
travis: retry brew install
, it randomly fails on downloads
...
$ brew tap adoptopenjdk/openjdk
Updating Homebrew...
==> Tapping adoptopenjdk/openjdk
Cloning into '/usr/local/Homebrew/Library/Taps/adoptopenjdk/homebrew-openjdk'...
fatal: unable to access 'https://github.com/adoptopenjdk/homebrew-openjdk/ ': Could not resolve host: github.com
Error: Failure while executing; `git clone https://github.com/adoptopenjdk/homebrew-openjdk /usr/local/Homebrew/Library/Taps/adoptopenjdk/homebrew-openjdk --depth=1` exited with 128.
The command "brew tap adoptopenjdk/openjdk" failed and exited with 1 during .
2019-09-23 11:32:56 +02:00
Hans-Christoph Steiner
0da93f9a7d
travis: test bash script syntax with macOS's bash version
...
!676
2019-09-23 11:32:55 +02:00
Hans-Christoph Steiner
c1110e0e69
Merge branch 'bash-3.2' into 'master'
...
Make gradlew-fdroid more portable
See merge request fdroid/fdroidserver!676
2019-09-23 09:31:22 +00:00
relan
932ab4a3c1
gradlew-fdroid: avoid sed
...
sed implementations (GNU sed vs. BSD sed) have variations in regex
syntax causing distributionUrl parsing to fail on macOS.
2019-09-23 07:12:17 +03:00
relan
944046b70b
gradlew-fdroid: avoid associative arrays
...
macOS is shipped with bash-3.2 that does not support associative arrays.
2019-09-23 07:10:44 +03:00
Hans-Christoph Steiner
644428dadf
Merge branch 'gradle-version-check' into 'master'
...
gitlab-ci: check gradle checksums against official list
See merge request fdroid/fdroidserver!674
2019-09-12 12:40:11 +00:00
Hans-Christoph Steiner
25548023e0
gitlab-ci: check gradle checksums against official list
2019-09-12 14:18:07 +02:00
Hans-Christoph Steiner
c70e2ff056
Merge branch 'add-gradle-5.6.1' into 'master'
...
Add Gradle 5.6.1 and 5.6.2
See merge request fdroid/fdroidserver!673
2019-09-09 11:04:11 +00:00
osscontrib
ce5a25811a
Add Gradle 5.6.1 and 5.6.2
2019-09-08 23:22:18 -04:00
Michael Pöhn
ceac51eac1
Merge branch 'patch-1' into 'master'
...
Update CHANGELOG.md
See merge request fdroid/fdroidserver!672
2019-08-30 19:32:30 +00:00
Michael Pöhn
79d470934d
Update CHANGELOG.md
2019-08-30 19:08:43 +00:00
Michael Pöhn
e8c926ba3b
Merge branch 'master' into 'master'
...
do not crash when returned system encoding is None
See merge request fdroid/fdroidserver!671
2019-08-30 19:04:40 +00:00
Pablo Castellano
4ec6958e33
do not crash when returned system encoding is None
2019-08-30 19:45:23 +02:00
Hans-Christoph Steiner
13dc98795f
Merge branch 'scanner-debian-maven' into 'master'
...
Fix local Debian Maven repo handling
See merge request fdroid/fdroidserver!670
2019-08-29 20:59:23 +00:00
relan
079754c56c
scanner: add a test for the local Debian Maven repo
2019-08-29 21:33:12 +03:00
relan
3a7ad650e3
scanner: fix local Debian Maven repo handling
...
The resulting regex was 'https?://file:///usr/share/maven-repo' causing
scanner error.
2019-08-29 21:32:54 +03:00
Hans-Christoph Steiner
c7cd731833
add Tidelift link to FUNDING.yml
...
[skip ci]
2019-08-29 10:04:19 +02:00
Hans-Christoph Steiner
1d5e241776
add donation links to GitHub FUNDING.yml
...
https://github.blog/2019-05-23-announcing-github-sponsors-a-new-way-to-contribute-to-open-source/
fdroiddata!5041
2019-08-29 09:27:29 +02:00
Hans-Christoph Steiner
a71d4e5ab8
Merge branch 'graphic-hash-filename-for-caching' into 'master'
...
Graphic hash filename for caching
See merge request fdroid/fdroidserver!669
2019-08-29 07:26:01 +00:00
Hans-Christoph Steiner
70e7e720b9
update: use graphics filename with hash in index to support caching
...
Using a filename based on the hash of the contents means that the caching
algorithms for fdroidclient and browsers can safely cache the file forever
using the filename, since this guarantees that the contents will never
change for a given filename.
This does not cover screenshots, only icon.png, featureGraphic.png,
tvBanner.png, and promoGraphic.png.
fdroidserver#689
fdroid-website!453
2019-08-29 08:23:51 +02:00
Hans-Christoph Steiner
508af00e84
update: only copy graphics and screenshots if mtime/size has changed
...
Instead of copying every time, trust the filesystem to tell us when the
file has changed.
2019-08-29 08:23:47 +02:00
Hans-Christoph Steiner
fbdecbceb7
setup.py: ruamel.yaml >= 0.15 required for yml rewrites
2019-08-28 15:57:44 +02:00
Hans-Christoph Steiner
ce54dbfc11
setup.py: use officially documented way of including README
...
https://packaging.python.org/tutorials/packaging-projects/
2019-08-28 15:57:43 +02:00
Hans-Christoph Steiner
f13c41e3ba
update: remove Provides: from template.yml test case
...
!654
dcf3837bcb
2019-08-28 15:57:40 +02:00
Hans-Christoph Steiner
7090ce63dd
Merge branch 'remove-provides-in-yml' into 'master'
...
Remove `Provides:` in yaml metadata
Closes #676
See merge request fdroid/fdroidserver!654
2019-08-28 13:39:59 +00:00
Hans-Christoph Steiner
a1f1b0f2e9
Merge branch 'fix-disapearing-metadata' into 'master'
...
keep yaml metadata when rewrite failed
Closes #645
See merge request fdroid/fdroidserver!658
2019-08-28 13:28:21 +00:00