From eea4b3c7d69e208e8cca55fc6e3193277dc1485c Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 14:33:18 -0700 Subject: [PATCH 01/36] sam2p: fix license --- srcpkgs/sam2p/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sam2p/template b/srcpkgs/sam2p/template index 24ac394b0d32..34eaa610b98e 100644 --- a/srcpkgs/sam2p/template +++ b/srcpkgs/sam2p/template @@ -1,14 +1,14 @@ # Template file for 'sam2p' pkgname=sam2p version=0.49.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-gif --enable-lzw" hostmakedepends="perl" depends="perl tif22pnm" short_desc="Raster image converter with smart PDF and PostScript output" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-only" homepage="https://github.com/pts/sam2p" distfiles="https://github.com/pts/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" checksum=5bc5b5a526bc798315da23b02564d6a1bfea51b364b8b03f76695a833f6d2bed From 7b103cbb8aeb3c3d0752341e96f9e4b16eb42536 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 14:34:54 -0700 Subject: [PATCH 02/36] sample: fix license --- srcpkgs/sample/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sample/template b/srcpkgs/sample/template index ab0b7df9a802..9361ce32165e 100644 --- a/srcpkgs/sample/template +++ b/srcpkgs/sample/template @@ -1,11 +1,11 @@ # Template file for 'sample' pkgname=sample version=0.1.0 -revision=3 +revision=4 build_style=gnu-makefile short_desc="Filter for random sampling of input" maintainer="Leah Neukirchen " -license="custom" +license="ISC" homepage="https://github.com/silentbicycle/sample/" distfiles="https://github.com/silentbicycle/sample/archive/v${version}.tar.gz" checksum=2ca15f1d293e80915abb98c311ddeeb2b99243df07aea554053ce296181a949d From fb42d16e150761d7ad2b0e75cf2958f7a5685cb1 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 14:40:09 -0700 Subject: [PATCH 03/36] samsung-unified-driver: fix license --- srcpkgs/samsung-unified-driver/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/samsung-unified-driver/template b/srcpkgs/samsung-unified-driver/template index 3ddf426e2ff3..fc49392fb6df 100644 --- a/srcpkgs/samsung-unified-driver/template +++ b/srcpkgs/samsung-unified-driver/template @@ -1,17 +1,17 @@ # Template file for 'samsung-unified-driver' pkgname=samsung-unified-driver version=1.00.37 -revision=3 -create_wrksrc=yes +revision=4 archs="i686 x86_64" -repository=nonfree +create_wrksrc=yes depends="cups ghostscript libusb-compat sane" short_desc="Unified Linux Driver for Samsung printers and scanners" maintainer="Thomas Bernard " -license="Propietary" -homepage="http://www.samsung.com" -distfiles="http://downloadcenter.samsung.com/content/DR/201512/20151210091120064/uld_v${version}_00.99.tar.gz" +license="custom:Propietary" +homepage="https://www.samsung.com" +distfiles="https://downloadcenter.samsung.com/content/DR/201512/20151210091120064/uld_v${version}_00.99.tar.gz" checksum="6b85253ea0bb51d241f6fd665ff0d39464cdad87084802a77a385c707fa2c664" +repository=nonfree nostrip=true post_extract() { From 1927ac30c7854759c832d97abc137b05bd92a81e Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 16:50:53 -0700 Subject: [PATCH 04/36] screen-message: fix license --- srcpkgs/screen-message/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/screen-message/template b/srcpkgs/screen-message/template index 903d693fb86f..277033966654 100644 --- a/srcpkgs/screen-message/template +++ b/srcpkgs/screen-message/template @@ -1,7 +1,7 @@ # Template file for 'screen-message' pkgname=screen-message version=0.26 -revision=1 +revision=2 build_style=gnu-configure make_build_args='execgamesdir=$(prefix)/bin' make_install_args=${make_build_args} @@ -9,8 +9,7 @@ hostmakedepends="pkg-config" makedepends="gtk+3-devel" short_desc="Displays a short text fullscreen " maintainer="lemmi " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://www.joachim-breitner.de/projects#screen-message" distfiles="https://www.joachim-breitner.de/archive/screen-message/screen-message-${version}.tar.gz" checksum=bc12a7b973844190c00a694d3fdc2327735b21d8b1231ec8ef66ba363ea98f37 - From d42670ff7eee396ad283b25e9449e40998f4e8ba Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 16:55:19 -0700 Subject: [PATCH 05/36] seq2gif: fix license, other lint --- srcpkgs/seq2gif/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/seq2gif/template b/srcpkgs/seq2gif/template index b7d00b730a4b..8146d539a284 100644 --- a/srcpkgs/seq2gif/template +++ b/srcpkgs/seq2gif/template @@ -1,11 +1,11 @@ # Template file for 'seq2gif' pkgname=seq2gif version=0.10.4 -revision=2 +revision=3 build_style=gnu-configure -homepage="http://saitoha.github.io/seq2gif/" -distfiles="https://github.com/saitoha/seq2gif/archive/v${version}.tar.gz" short_desc="Convert ttyrec recordings into high quality gifs" maintainer="Andrew Benson " -license="GPL-3" +license="GPL-3.0-or-later" +homepage="http://saitoha.github.io/seq2gif/" +distfiles="https://github.com/saitoha/seq2gif/archive/v${version}.tar.gz" checksum=738805bf8eb7ee5171ded7f43326cca7caecb77031283720f97253c234261f29 From e89b7df2b85cc18c5a5a3adb90bd134e11ca2d10 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 16:56:51 -0700 Subject: [PATCH 06/36] sgfutils: fix license, http->https, other lint --- srcpkgs/sgfutils/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template index 95e84d22279b..67980c8d32fb 100644 --- a/srcpkgs/sgfutils/template +++ b/srcpkgs/sgfutils/template @@ -1,13 +1,13 @@ # Template file for 'sgfutils' pkgname=sgfutils version=0.25 -revision=7 +revision=8 build_style=gnu-makefile +makedepends="openssl-devel" +depends="ImageMagick" short_desc="Collection of utilities to handle SGF files" maintainer='Brandon Wilson ' -license="GPL-2" -homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/" -distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz" +license="GPL-2.0-or-later" +homepage="https://www.cwi.nl/~aeb/go/sgfutils/html/" +distfiles="https://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz" checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2 -makedepends="openssl-devel" -depends="ImageMagick" From 76cbf9cfe3637277d0fce568adfef3fa9acf035a Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 17:01:24 -0700 Subject: [PATCH 07/36] shake: fix license --- srcpkgs/shake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/shake/template b/srcpkgs/shake/template index a5793b17e374..08790572f3c4 100644 --- a/srcpkgs/shake/template +++ b/srcpkgs/shake/template @@ -1,13 +1,13 @@ # Template file for 'shake' pkgname=shake version=1.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="help2man" makedepends="attr-devel" short_desc="Defragmenter that runs in userspace while the system is used" maintainer="Casper Ti. Vector " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://vleu.net/shake/" distfiles="https://github.com/unbrice/$pkgname/archive/v$version.tar.gz" checksum=ac5a57bd8d55e197734852bf66318ecf39b4c5c298e43a259ba1d8a4b7a2ced3 From 60cb3230b9f1cb749ea43976618d420c6ccad82e Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 18:05:29 -0700 Subject: [PATCH 08/36] shmux: fix license --- srcpkgs/shmux/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/shmux/template b/srcpkgs/shmux/template index a055469be8c7..3f353a0df33b 100644 --- a/srcpkgs/shmux/template +++ b/srcpkgs/shmux/template @@ -1,12 +1,12 @@ # Template file for 'shmux' pkgname=shmux version=1.0.3 -revision=1 +revision=2 build_style=gnu-configure makedepends="ncurses-devel pcre-devel" short_desc="Shell multiplexer (parallel SSH)" maintainer="Leah Neukirchen " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/shmux/shmux" distfiles="https://github.com/shmux/shmux/archive/v${version}.tar.gz" checksum=c9f8863e2550e23e633cf5fc7a9c4c52d287059f424ef78aba6ecd98390fb9ab From 6d988a07a13eebb734e87b02cd8814410ce51310 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 18:08:15 -0700 Subject: [PATCH 09/36] shntool: fix license, homepage --- srcpkgs/shntool/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/shntool/template b/srcpkgs/shntool/template index 325295ef99af..385f5b746efd 100644 --- a/srcpkgs/shntool/template +++ b/srcpkgs/shntool/template @@ -1,11 +1,11 @@ # Template file for 'shntool' pkgname=shntool version=3.0.10 -revision=2 +revision=3 build_style=gnu-configure -short_desc="A multi-purpose WAVE data processing and reporting utility" +short_desc="Multi-purpose WAVE data processing and reporting utility" maintainer="Georg S. " -license="GPL-2" -homepage="http://www.etree.org/shnutils/shntool/" +license="GPL-2.0-or-later" +homepage="http://shnutils.freeshell.org/shntool/" distfiles="${DEBIAN_SITE}/main/s/shntool/shntool_${version}.orig.tar.gz" checksum=74302eac477ca08fb2b42b9f154cc870593aec8beab308676e4373a5e4ca2102 From 29f43524e1b880b90b038236601e900639929f0c Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 18:10:56 -0700 Subject: [PATCH 10/36] sift: fix license, correct description --- srcpkgs/sift/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template index 22a9698bf44d..703a7765511c 100644 --- a/srcpkgs/sift/template +++ b/srcpkgs/sift/template @@ -1,13 +1,13 @@ # Template file for 'sift' pkgname=sift version=0.9.0 -revision=12 +revision=13 build_style=go +go_import_path="github.com/svent/sift" hostmakedepends="git" -short_desc="A fast and powerful open source alternative to grep" +short_desc="Fast and powerful alternative to grep" maintainer="Andrea Brancaleoni " -license="GPL-3" -go_import_path="github.com/svent/sift" +license="GPL-3.0-only" homepage="https://github.com/svent/sift" distfiles="$homepage/archive/v$version.tar.gz" checksum=bbbd5c472c36b78896cd7ae673749d3943621a6d5523d47973ed2fc6800ae4c8 From 34f5424d39b973841b8c1d272421792c3ac08cd9 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 18:12:32 -0700 Subject: [PATCH 11/36] sigrok-cli: fix license --- srcpkgs/sigrok-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sigrok-cli/template b/srcpkgs/sigrok-cli/template index c3e8d07d39b5..3206dd45815c 100644 --- a/srcpkgs/sigrok-cli/template +++ b/srcpkgs/sigrok-cli/template @@ -1,14 +1,14 @@ # Template file for 'sigrok-cli' pkgname=sigrok-cli version=0.7.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="glib-devel libzip-devel libsigrok-devel libsigrokdecode-devel" depends="sigrok-firmware-fx2lafw" short_desc="Provide the basic sigrok functionality from the command-line" maintainer="lemmi " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://sigrok.org/" distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" checksum=71d0443f36897bf565732dec206830dbea0f2789b6601cf10536b286d1140ab8 From 40aebe227b1ea8547cd0eafcf3c8bf1ac914dbd0 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 18:20:30 -0700 Subject: [PATCH 12/36] silc-toolkit: fix license, correct vlicense statements --- srcpkgs/silc-toolkit/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/silc-toolkit/template b/srcpkgs/silc-toolkit/template index fc67ac84df15..1c7a03b3ad54 100644 --- a/srcpkgs/silc-toolkit/template +++ b/srcpkgs/silc-toolkit/template @@ -1,7 +1,7 @@ # Template file for 'silc-toolkit' pkgname=silc-toolkit version=1.1.12 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-perl=yes --with-simdir=/usr/lib/silc/modules --enable-debug --enable-ipv6 --disable-optimizations @@ -10,7 +10,7 @@ hostmakedepends="nasm perl" makedepends="gmp-devel libidn-devel" short_desc="Secure Internet Live Conferencing protocol toolkit" maintainer="Orphaned " -license="GPL-2,BSD" +license="GPL-2.0-or-later, BSD-3-Clause" homepage="http://www.silcnet.org/" distfiles="${SOURCEFORGE_SITE}/silc/silc/client/sources/$pkgname-$version.tar.bz2" checksum=be170288f79fbe34971fc26fe762a8329621e11a117f20c218857f2bbad24d6e @@ -18,7 +18,6 @@ checksum=be170288f79fbe34971fc26fe762a8329621e11a117f20c218857f2bbad24d6e post_install() { #Remove large (useless) documentation. rm -rf usr/share/doc/silc-toolkit/toolkit - vlicense COPYING vlicense BSD } From a0486879baeda76d4ab8e752a30162203b67579b Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 18:22:02 -0700 Subject: [PATCH 13/36] sipcalc: fix license --- srcpkgs/sipcalc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sipcalc/template b/srcpkgs/sipcalc/template index 22f05270a390..ae62cd504775 100644 --- a/srcpkgs/sipcalc/template +++ b/srcpkgs/sipcalc/template @@ -1,11 +1,11 @@ # Template file for 'sipcalc' pkgname=sipcalc version=1.1.6 -revision=1 +revision=2 build_style=gnu-configure short_desc="Console based ip subnet calculator" maintainer="allan " -license="BSD" +license="BSD-3-Clause" homepage="http://www.routemeister.net/projects/sipcalc/" distfiles="http://www.routemeister.net/projects/sipcalc/files/${pkgname}-${version}.tar.gz" checksum=cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357 From 199b679c2e4725c5afcbebee1c2406edfeedf77a Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 22:55:13 -0700 Subject: [PATCH 14/36] skippy-xd: fix license, description --- srcpkgs/skippy-xd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/skippy-xd/template b/srcpkgs/skippy-xd/template index d7b89eecd81f..c782f7aeba8b 100644 --- a/srcpkgs/skippy-xd/template +++ b/srcpkgs/skippy-xd/template @@ -1,16 +1,16 @@ # Template file for 'skippy-xd' pkgname=skippy-xd version=2016.10.20 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="libX11-devel libXext-devel libXft-devel libXcomposite-devel libXdamage-devel libXfixes-devel libXinerama-devel libXmu-devel libXrender-devel freetype-devel imlib2-devel fontconfig-devel giflib-devel libjpeg-turbo-devel libpng-devel zlib-devel" conf_files="/etc/xdg/*.rc" -short_desc="An Expose-like full-screen task-switcher for X11" +short_desc="Expose-like full-screen task-switcher for X11" maintainer="Antonio Malcolm " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/antonio-malcolm/skippy-xd" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=221a27e96b3ff759a2fb0f9909063c60e0c206c87d024f49b77484f92a37e4c2 From 7cfa710e717053ecbae9d68e04a59fc952d1ec2c Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 23:06:19 -0700 Subject: [PATCH 15/36] sl: fix license --- srcpkgs/sl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sl/template b/srcpkgs/sl/template index f4669dafd7e9..ba929eb628f6 100644 --- a/srcpkgs/sl/template +++ b/srcpkgs/sl/template @@ -1,12 +1,12 @@ # Template file for 'sl' pkgname=sl version=5.02 -revision=2 +revision=3 build_style=gnu-makefile makedepends="ncurses-devel" short_desc="Correct you if you type (sl) by mistake" maintainer="Diogo Leal " -license="custom" +license="custom:0BSD-like" homepage="https://github.com/mtoyoda/sl" distfiles="https://github.com/mtoyoda/sl/archive/${version}.tar.gz" checksum=1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb5563a From 09bccb382974ccdfa3d0a462faecc7a4db45e35a Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 23:10:22 -0700 Subject: [PATCH 16/36] slrn: fix license --- srcpkgs/slrn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template index 95d398859836..85765f5e8378 100644 --- a/srcpkgs/slrn/template +++ b/srcpkgs/slrn/template @@ -1,7 +1,7 @@ # Template file for 'slrn' pkgname=slrn version=1.0.3a -revision=8 +revision=9 wrksrc="${pkgname}-${version%a}" build_style=gnu-configure configure_args="--with-slrnpull --with-ssl @@ -11,7 +11,7 @@ configure_args="--with-slrnpull --with-ssl makedepends="openssl-devel slang-devel" short_desc="Text mode Usenet news reader" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.slrn.org/" # distfiles="http://jedsoft.org/releases/slrn/${pkgname}-${version}.tar.bz2" distfiles="https://ftp.icm.edu.pl/packages/slrn/slrn-${version}.tar.bz2" From c40bc0117e1b12069bc96643d1216181ec72b87e Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 23:23:14 -0700 Subject: [PATCH 17/36] sloccount: fix license, http->https, fix distfile link --- srcpkgs/sloccount/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/sloccount/template b/srcpkgs/sloccount/template index 4abe5ab8074a..f33b58e0aea4 100644 --- a/srcpkgs/sloccount/template +++ b/srcpkgs/sloccount/template @@ -1,16 +1,16 @@ -# Template build file for 'sloccount' +# Template file for 'sloccount' pkgname=sloccount version=2.26 -revision=4 +revision=5 build_style=gnu-makefile hostmakedepends="flex" makedepends="perl" depends="perl" short_desc="Tool to count physical source lines of code in many languages" maintainer="Orphaned " -license="GPL-2" -homepage="http://www.dwheeler.com/sloccount/" -distfiles="$homepage/$pkgname-$version.tar.gz" +license="GPL-2.0-or-later" +homepage="https://dwheeler.com/sloccount/" +distfiles="https://dwheeler.com/sloccount/sloccount-${version}.tar.gz" checksum=fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b do_install() { From 540ef2140cc07e57c0417269255d913dd5b433be Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 12 May 2021 23:49:04 -0700 Subject: [PATCH 18/36] slurm: fix license, vsed updates --- srcpkgs/slurm/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/slurm/template b/srcpkgs/slurm/template index e07f77c486bc..64ade843fce4 100644 --- a/srcpkgs/slurm/template +++ b/srcpkgs/slurm/template @@ -1,21 +1,21 @@ # Template file for 'slurm' pkgname=slurm version=0.4.3 -revision=4 +revision=5 wrksrc="${pkgname}-upstream-${version}" build_style="cmake" makedepends="ncurses-devel" short_desc="Yet another network load monitor" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/mattthias/slurm" distfiles="https://github.com/mattthias/slurm/archive/upstream/${version}.tar.gz" checksum=b960c0d215927be1d02c176e1b189321856030226c91f840284886b727d3a3ac -post_extract() { - sed -i '//d' os.h - sed -i 's,,,g' os.h - sed -i 's,,,g' os.h +post_patch() { + vsed -i '//d' os.h + vsed -i 's,,,g' os.h + vsed -i 's,,,g' os.h } post_install() { vman slurm.1 From 897e2aa6376bedf20ff9e038a78b6e6a2912fc25 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 00:24:38 -0700 Subject: [PATCH 19/36] smpeg: fix license, other lint --- srcpkgs/smpeg/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template index adb368002d41..9a958bd1bbae 100644 --- a/srcpkgs/smpeg/template +++ b/srcpkgs/smpeg/template @@ -1,15 +1,15 @@ # Template file for 'smpeg' pkgname=smpeg version=0.4.5 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr --disable-gtk-player --disable-opengl-player" make_build_args="LDFLAGS+=-lstdc++" makedepends="SDL-devel" short_desc="SDL MPEG Player Library" -homepage="https://icculus.org/smpeg/" -license="LGPL-2.1" maintainer="Orphaned " +license="LGPL-2.1-only" +homepage="https://icculus.org/smpeg/" distfiles="ftp://slackware.oregonstate.edu/.1/vectorlinux/VL64-7.0/source/sourceVL/smpeg/${version}/src/smpeg-${version}.tar.gz" checksum=1839c12e88d5dbbc767a7b94eeab2aa3efe4f0eebb7eb7c7240270ba93689a2b From 146221a5e41da348fa5a6dc896530d026f71f82f Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 00:41:09 -0700 Subject: [PATCH 20/36] smpeg2: fix license, other lint --- srcpkgs/smpeg2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/smpeg2/template b/srcpkgs/smpeg2/template index 5bc6ccf5f7c3..5c87e4416dae 100644 --- a/srcpkgs/smpeg2/template +++ b/srcpkgs/smpeg2/template @@ -1,13 +1,13 @@ # Template file for 'smpeg2' pkgname=smpeg2 version=2.0.0 -revision=4 +revision=5 build_style=gnu-configure makedepends="SDL2-devel" short_desc="SDL2 MPEG Player Library" -homepage="https://icculus.org/smpeg/" -license="LGPL-2.1" maintainer="rogi " +license="LGPL-2.1-or-later" +homepage="https://icculus.org/smpeg/" distfiles="https://www.libsdl.org/projects/smpeg/release/smpeg2-${version}.tar.gz" checksum=979a65b211744a44fa641a9b6e4d64e64a12ff703ae776bafe3c4c4cd85494b3 From d44490f9e8680aea8a1d0d94dc992a285d0d59ce Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 00:43:09 -0700 Subject: [PATCH 21/36] snappy-player: fix license --- srcpkgs/snappy-player/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/snappy-player/template b/srcpkgs/snappy-player/template index 2fc04cbedc68..da6f9e498634 100644 --- a/srcpkgs/snappy-player/template +++ b/srcpkgs/snappy-player/template @@ -1,14 +1,14 @@ -# Template file for 'snappy-player +# Template file for 'snappy-player' pkgname=snappy-player version=1.0 -revision=3 +revision=4 wrksrc="snappy-${version}" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="clutter-gtk-devel clutter-gst-devel gst-plugins-base1-devel" short_desc="Powerful media player with a minimalistic interface" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Snappy" distfiles="${GNOME_SITE}/snappy/${version}/snappy-${version}.tar.xz" checksum=0d33a05c1ad3cc075b8b9bf38d45634ea5204159454597b0882dd6a8d9763f58 From cb785190a2e9d17056004502a12707166747e27b Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 21:41:23 -0700 Subject: [PATCH 22/36] sound-icons: fix license --- srcpkgs/sound-icons/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/sound-icons/template b/srcpkgs/sound-icons/template index adfaa77766bc..649f97ae856f 100644 --- a/srcpkgs/sound-icons/template +++ b/srcpkgs/sound-icons/template @@ -1,12 +1,12 @@ # Template file for 'sound-icons' pkgname=sound-icons version=0.1 -revision=2 +revision=3 short_desc="Sounds for speech enabled applications" maintainer="Alain Kalker " -license="GPL-2" -homepage="http://www.freebsoft.org/pub/projects/sound-icons/" -distfiles="http://www.freebsoft.org/pub/projects/sound-icons/${pkgname}-${version}.tar.gz" +license="GPL-2.0-only" +homepage="https://www.freebsoft.org/pub/projects/sound-icons/" +distfiles="https://www.freebsoft.org/pub/projects/sound-icons/${pkgname}-${version}.tar.gz" checksum=382dda1d14a07b3125a8b5084695aa9ba5cb0fff02e5aab69fd6c7e23cbcf4d7 do_install() { From 814f968623f97855d3680da6f32153d0fc2eaf76 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 21:45:25 -0700 Subject: [PATCH 23/36] soundmodem: fix license --- srcpkgs/soundmodem/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/soundmodem/template b/srcpkgs/soundmodem/template index 6c9e01fd3003..91ae349d3c1a 100644 --- a/srcpkgs/soundmodem/template +++ b/srcpkgs/soundmodem/template @@ -1,13 +1,13 @@ # Template file for 'soundmodem' pkgname=soundmodem version=0.18 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config gettext-devel alsa-lib-devel" makedepends="alsa-lib-devel audiofile-devel gtk+-devel libxml2-devel" short_desc="Multiplatform Soundcard Packet Radio Modem" maintainer="Michael Aldridge " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://soundmodem.vk4msl.yi.org/" distfiles="http://soundmodem.vk4msl.yi.org/soundmodem-${version}.tar.gz" checksum=f033c1716df1378cda646dbb1c48ea9fb9a068772c6686f2ca411bfa64245c1c From c35930f3646d8f01e17856a01e2f553b17d82d34 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 21:46:51 -0700 Subject: [PATCH 24/36] spawn-fcgi: fix license, http->https --- srcpkgs/spawn-fcgi/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/spawn-fcgi/template b/srcpkgs/spawn-fcgi/template index 2702256ef50d..7a8a24d0d468 100644 --- a/srcpkgs/spawn-fcgi/template +++ b/srcpkgs/spawn-fcgi/template @@ -1,13 +1,13 @@ # Template file for 'spawn-fcgi' pkgname=spawn-fcgi version=1.6.4 -revision=3 +revision=4 build_style=gnu-configure short_desc="Spawn FastCGI applications" maintainer="Orphaned " -license="BSD" -homepage="http://redmine.lighttpd.net/projects/spawn-fcgi/" -distfiles="http://www.lighttpd.net/download/${pkgname}-${version}.tar.bz2" +license="BSD-3-Clause" +homepage="https://redmine.lighttpd.net/projects/spawn-fcgi/" +distfiles="https://www.lighttpd.net/download/${pkgname}-${version}.tar.bz2" checksum=a3cfc7c9581b6ddc31084b379c9160323fa345d357ace6cd2d3d3af3593e2873 post_install() { From e291d33447eab441658608c9ceadc2280a0cee86 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 21:55:44 -0700 Subject: [PATCH 25/36] speedcrunch: fix license, http->https, other lint --- srcpkgs/speedcrunch/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/speedcrunch/template b/srcpkgs/speedcrunch/template index 01588a08d538..5347c6184c10 100644 --- a/srcpkgs/speedcrunch/template +++ b/srcpkgs/speedcrunch/template @@ -1,7 +1,7 @@ # Template file for 'speedcrunch' pkgname=speedcrunch version=0.12.0 -revision=1 +revision=2 _hash=ea93b21f9498 wrksrc="heldercorreia-${pkgname}-${_hash}" build_wrksrc="src" @@ -10,12 +10,11 @@ makedepends="qt5-tools-devel qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-tds qt5-plugin-odbc qt5-plugin-sqlite" short_desc="High-precision scientific calculator" maintainer="newbluemoon " -license="GPL-2" -homepage="http://speedcrunch.org/" +license="GPL-2.0-or-later" +homepage="https://speedcrunch.org/" distfiles="https://bitbucket.org/heldercorreia/${pkgname}/get/release-${version}.tar.bz2" checksum=59bfc6747060dd15c43c1e9afffdb708c15e3c2a7c36855b83952f33ba451d85 if [ -n "$CROSS_BUILD" ]; then hostmakedepends="qt5-tools-devel" fi - From fafee82b32523f68f39f2aace3524bd9366a53c5 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 21:59:08 -0700 Subject: [PATCH 26/36] speex: fix license, http->https, other lint --- srcpkgs/speex/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/speex/template b/srcpkgs/speex/template index a0d9c2191077..a380f999427f 100644 --- a/srcpkgs/speex/template +++ b/srcpkgs/speex/template @@ -1,14 +1,14 @@ -# Template file for 'speex'. +# Template file for 'speex' pkgname=speex version=1.2.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="fftw-devel libogg-devel speexdsp-devel" -short_desc="A free codec for free speech" -homepage="http://www.speex.org" -license="BSD" +short_desc="Free codec for free speech" maintainer="Orphaned " +license="BSD-3-Clause" +homepage="https://www.speex.org" distfiles="http://downloads.xiph.org/releases/speex/speex-$version.tar.gz" checksum=eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094 From 56ccf518d86b0317652c5302d3e64f5820d34500 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 22:32:15 -0700 Subject: [PATCH 27/36] spim: fix license, other lint --- srcpkgs/spim/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/spim/template b/srcpkgs/spim/template index ea3a76f626c4..347ff447611b 100644 --- a/srcpkgs/spim/template +++ b/srcpkgs/spim/template @@ -1,22 +1,22 @@ -# Template file for spim +# Template file for 'spim' pkgname=spim version=8.0 -revision=2 +revision=3 build_wrksrc=spim build_style=configure configure_script="./Configure" make_install_target="install install-man" +hostmakedepends="flex" +short_desc="Self-contained simulator/debugger that runs MIPS32 programs" +maintainer="Toyam Cox " +license="BSD-3-Clause" homepage="http://spimsimulator.sourceforge.net/" -license="BSD" distfiles="http://pages.cs.wisc.edu/~larus/SPIM/spim-${version}.tar.gz" checksum="6f205776cb9fa112729507008843b289012190ed3131cbd426c610a58387ee4b" -maintainer="Toyam Cox " -hostmakedepends="flex" -short_desc="Self-contained simulator/debugger that runs MIPS32 programs" pre_configure() { sed '/Copyright (c) 1990-2010, James R. Larus./,+26!d' README > LICENSE - sed -i Makefile \ + vsed -i Makefile \ -e 's:CFLAGS =:CFLAGS +=:' \ -e 's:LDFLAGS =:LDFLAGS +=:' \ -e 's:CC = gcc:CC ?= gcc:' \ From 540fbddde0b0f37eb5f2f7b4044e6a12b584b9f4 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 22:34:47 -0700 Subject: [PATCH 28/36] splint: fix license --- srcpkgs/splint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template index 4e3a93eaf29e..860444148ead 100644 --- a/srcpkgs/splint/template +++ b/srcpkgs/splint/template @@ -1,15 +1,15 @@ # Template file for 'splint' pkgname=splint version=3.1.2 -revision=4 +revision=5 wrksrc="${pkgname}-${version}.orig" build_style=gnu-configure hostmakedepends="flex" makedepends="libfl-devel" short_desc="Secure Programming Lint" maintainer="Orphaned " +license="GPL-2.0-or-later" homepage="http://www.splint.org" -license="GPL-2" distfiles="${DEBIAN_SITE}/main/s/splint/${pkgname}_${version}+dfsg.orig.tar.xz" checksum=51cd7ba978a366ae1ededac2b927058fd5f45d5455e5a9d640b75ab4e45b748a disable_parallel_build=yes From df8e3d82e193ba8f39dddb18264f35b09417a197 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 22:44:00 -0700 Subject: [PATCH 29/36] spreed-webrtc: fix license --- srcpkgs/spreed-webrtc/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template index a80a3e1f6743..7baa339cc7e5 100644 --- a/srcpkgs/spreed-webrtc/template +++ b/srcpkgs/spreed-webrtc/template @@ -1,7 +1,7 @@ # Template file for 'spreed-webrtc' pkgname=spreed-webrtc version=0.29.7 -revision=8 +revision=9 build_style=go go_import_path="github.com/strukturag/spreed-webrtc" go_package="${go_import_path}/src/app/spreed-webrtc-server" @@ -9,7 +9,7 @@ hostmakedepends="automake nodejs git which" conf_files="/etc/spreed/webrtc.conf" short_desc="WebRTC audio/video call and conferencing server and web client" maintainer="Toyam Cox " -license="AGPL-3" +license="AGPL-3.0-or-later" homepage="https://github.com/strukturag/spreed-webrtc" distfiles="https://github.com/strukturag/spreed-webrtc/archive/v${version}.tar.gz" checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268 @@ -26,6 +26,7 @@ post_install() { vsconf server.conf.in vmkdir etc/spreed 755 vinstall server.conf.in 644 etc/spreed webrtc.conf # Match Ubuntu packaging and thus online docs + vlicense LICENSE export SHARE=/usr/share/spreed-webrtc-server make DESTDIR="${DESTDIR}" install-assets From f512c6e5596bb3486ec2c99d3cb973ef039df83d Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 22:46:57 -0700 Subject: [PATCH 30/36] stalonetray: fix license, other lint --- srcpkgs/stalonetray/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/stalonetray/template b/srcpkgs/stalonetray/template index 5fa83c506ecc..9e2f06365c46 100644 --- a/srcpkgs/stalonetray/template +++ b/srcpkgs/stalonetray/template @@ -1,12 +1,12 @@ # Template file for 'stalonetray' pkgname=stalonetray version=0.8.3 -revision=2 -makedepends="libSM-devel libXpm-devel" +revision=3 build_style=gnu-configure +makedepends="libSM-devel libXpm-devel" short_desc="Standalone system tray (notification area)" maintainer="Thomas Adam " -license="GPL-2" +license="GPL-2.0-only" homepage="http://stalonetray.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/stalonetray/${version}/stalonetray-${version}.tar.gz" checksum=f47468a4ecabf93d22774e3fb5e1aba76e8e8d2d76e878975c7c43b65a8353e3 From a586421edc52abb8cf74c1f3df7964ae1347c145 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 22:53:02 -0700 Subject: [PATCH 31/36] startup-notification: fix license, homepage --- srcpkgs/startup-notification/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/startup-notification/template b/srcpkgs/startup-notification/template index 2f5a6b75ff17..da164f378b18 100644 --- a/srcpkgs/startup-notification/template +++ b/srcpkgs/startup-notification/template @@ -1,15 +1,15 @@ # Template file for 'startup-notification' pkgname=startup-notification version=0.12 -revision=10 +revision=11 build_style=gnu-configure configure_args="--disable-static lf_cv_sane_realloc=yes lf_cv_sane_malloc=yes" hostmakedepends="pkg-config" makedepends="libX11-devel libSM-devel xcb-util-devel" short_desc="Library for tracking application startup" maintainer="Orphaned " -license="LGPL-2.1" -homepage="http://www.freedesktop.org" +license="LGPL-2.1-only" +homepage="https://www.freedesktop.org/wiki/Software/startup-notification/" distfiles="${FREEDESKTOP_SITE}/$pkgname/releases/$pkgname-$version.tar.gz" checksum=3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a From 5a2a1041b328fae8325b365e272a1be4bfbc64f9 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 22:55:44 -0700 Subject: [PATCH 32/36] stfl: fix license --- srcpkgs/stfl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template index a66f54dad904..0d970c9d2c26 100644 --- a/srcpkgs/stfl/template +++ b/srcpkgs/stfl/template @@ -1,13 +1,13 @@ # Template file for 'stfl' pkgname=stfl version=0.24 -revision=3 +revision=4 build_style=gnu-makefile hostmakedepends="swig" makedepends="ncurses-devel" short_desc="Curses-based widget set for text terminals" maintainer="Logen K " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.clifford.at/stfl/" distfiles="http://www.clifford.at/${pkgname}/${pkgname}-${version}.tar.gz" checksum=d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c090 From d6b2ba7e1de7095b6997cca7025db52bdab2ecdf Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 22:58:34 -0700 Subject: [PATCH 33/36] streamripper: fix license --- srcpkgs/streamripper/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/streamripper/template b/srcpkgs/streamripper/template index 92f93db2fc2b..8530d816be12 100644 --- a/srcpkgs/streamripper/template +++ b/srcpkgs/streamripper/template @@ -1,13 +1,13 @@ # Template file for 'streamripper' pkgname=streamripper version=1.64.6 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="glib-devel libvorbis-devel libmad-devel faad2-devel" short_desc="Mp3 recorder for shoutcast-compatible streams / internet radio" maintainer="Piraty " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://streamripper.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=c1d75f2e9c7b38fd4695be66eff4533395248132f3cc61f375196403c4d8de42 From 049eb372a66f29ceffc196aab124961c36d7bf38 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 23:13:33 -0700 Subject: [PATCH 34/36] sunwait: fix license, other lint --- srcpkgs/sunwait/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sunwait/template b/srcpkgs/sunwait/template index 5c470494b430..0d6b08a25982 100644 --- a/srcpkgs/sunwait/template +++ b/srcpkgs/sunwait/template @@ -1,12 +1,12 @@ # Template file for 'sunwait' pkgname=sunwait version=0.20041208 -revision=1 +revision=2 wrksrc="${pkgname}-${version##*.}" build_style=gnu-makefile -short_desc="A small C program calculating sunrise and sunset" +short_desc="Small C program calculating sunrise and sunset" maintainer="Michael Aldridge " -license="GPL-2" +license="GPL-2.0-only" homepage="http://www.risacher.org/sunwait/" distfiles="${homepage}${pkgname}-${version##*.}.tar.gz" checksum=46ecd64142e0c7c2decac8df241b78ccae0d1b323929fb4d61aa1acc16a9ff96 From da10af3d24ee3030427c96985c238b3b95cccaaf Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 13 May 2021 23:40:24 -0700 Subject: [PATCH 35/36] swh-lv2: fix license, other lint, use vsed --- srcpkgs/swh-lv2/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/swh-lv2/template b/srcpkgs/swh-lv2/template index ed1c9bfa82e2..abf1c8a34019 100644 --- a/srcpkgs/swh-lv2/template +++ b/srcpkgs/swh-lv2/template @@ -1,19 +1,19 @@ # Template file for 'swh-lv2' pkgname=swh-lv2 version=1.0.16 -revision=1 -build_style=gnu-makefile +revision=2 wrksrc="lv2-${version}" +build_style=gnu-makefile make_install_target="install-system" -homepage="http://plugin.org.uk/" -distfiles="https://github.com/swh/lv2/archive/v${version}.tar.gz" hostmakedepends="pkg-config libxslt" makedepends="fftw-devel" short_desc="Collection of GPL (free software) LV2 audio plugins" maintainer="Orphaned " -license="GPL-3" +license="GPL-3.0-or-later" +homepage="http://plugin.org.uk/" +distfiles="https://github.com/swh/lv2/archive/v${version}.tar.gz" checksum=bc24512de6e2fb7a493226e2e01a80ba8462a318b15c3b0fd0cd914b018c3548 post_extract() { - sed -i -e 's|$(INSTALL_DIR_REALLY)|$(DESTDIR)/$(INSTALL_DIR)|' Makefile + vsed -i -e 's|$(INSTALL_DIR_REALLY)|$(DESTDIR)/$(INSTALL_DIR)|' Makefile } From 03d8ef0fc27baf0260bf43980255b7ec486ab975 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Fri, 14 May 2021 00:01:58 -0700 Subject: [PATCH 36/36] systemsettings: fix license --- srcpkgs/systemsettings/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template index 04b62fea2561..3ceba15094d8 100644 --- a/srcpkgs/systemsettings/template +++ b/srcpkgs/systemsettings/template @@ -1,7 +1,7 @@ # Template file for 'systemsettings' pkgname=systemsettings version=5.21.5 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="python3 qt5-qmake qt5-host-tools kconfig @@ -11,7 +11,7 @@ makedepends="kcmutils-devel kdoctools khtml-devel kactivities5-stats-devel depends="kirigami2 setxkbmap xrdb" short_desc="KDE System settings" maintainer="John " -license="GPL-2.0-or-later, GFDL-1.2" +license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/systemsettings" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=95784e6f0dc89778ebbd0bc4536f690cd8454001c7665eb853c0c6eace987acd