ArchPOWER/packages
1
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects Releases 18 Wiki Activity

Merge branch 'master' of github.com:kth5/archpower into powerpc-32bit

Browse Source
This commit is contained in:
Alexander Baldeck 2021-01-01 18:37:38 +01:00
commit b653c1a636
1367 changed files with 26493 additions and 9663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
adobe-source-code-pro-fonts/PKGBUILD
View File

@ -1,27 +1,22 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgname=adobe-source-code-pro-fonts
pkgver=2.030ro+1.050it
_relver=2.030R-ro/1.050R-it
pkgrel=7
pkgver=2.032ro+1.052it+1.012var
pkgrel=1
pkgdesc="Monospaced font family for user interface and coding environments"
url="https://adobe-fonts.github.io/source-code-pro/"
arch=(any)
license=(custom)
_relver=2.032R-ro/1.052R-it/1.012R-VAR
_tarname=source-code-pro-${_relver//\//-}
source=("$_tarname.tar.gz::https://github.com/adobe-fonts/source-code-pro/archive/$_relver.tar.gz"
https://github.com/adobe-fonts/source-code-pro/releases/download/variable-fonts/SourceCodeVariable-Roman.otf
https://github.com/adobe-fonts/source-code-pro/releases/download/variable-fonts/SourceCodeVariable-Italic.otf)
sha256sums=('a4e4dd59b8e0a436b934f0f612c2e91b5932910c6d1c3b7d1a5a9f389c86302b'
'af8fdd265f6208816fde44062a27b79ce2a594ded44ea96055a1655b6869992d'
'b2ca3a3c1fe0701ad74aa7c66c37972d07b1237197a816a1a5646c7e42a11353')
source=("$_tarname.tar.gz::https://github.com/adobe-fonts/source-code-pro/archive/$_relver.tar.gz")
sha256sums=('4e21492169b9efdd8c40ed6c34aa0d5e58d2a8724d0cd98f2e0f88ccf5ecc78c')
package() {
cd $_tarname
install -d "$pkgdir/usr/share/fonts/${pkgname%-fonts}"
install -t "$pkgdir/usr/share/fonts/${pkgname%-fonts}" -m644 OTF/*.otf ../*.otf
install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -Dt "$pkgdir/usr/share/fonts/${pkgname%-fonts}" -m644 OTF/*.otf VAR/*.otf
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE.md
}
# vim:set ts=2 sw=2 et:

8
alembic/PKGBUILD
View File

@ -2,16 +2,16 @@
# Maintainer: Sven-Hendrik Haase <svenstaro@gmail.com>
pkgname=alembic
pkgver=1.7.15
pkgrel=1
pkgdesc="A open framework for storing and sharing scene data"
pkgver=1.7.16
pkgrel=2
pkgdesc="An open framework for storing and sharing scene data"
arch=(x86_64 powerpc64le)
url="http://www.alembic.io/"
license=('BSD')
depends=('openexr' 'boost-libs' 'hdf5')
makedepends=('cmake' 'boost' 'ninja')
source=($pkgname-$pkgver.tar.gz::https://github.com/alembic/alembic/archive/${pkgver}.tar.gz)
sha512sums=('a16ce301607530e04021b60227781b1e82927a85545a5c273062d8afd5b13949462d0957e0bdf05a04813fab864631760b4d264f289198b7c825dafbe6324382')
sha512sums=('bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1')
build() {
cd "${pkgname}-${pkgver}"

11
aom/PKGBUILD
View File

@ -1,9 +1,9 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Contributor: Chocobo1 <chocobo1 AT archlinux DOT net>
pkgname=aom
pkgver=2.0.0
pkgver=2.0.1
pkgrel=1
pkgdesc="Alliance for Open Media video codec"
url="https://aomedia.org/"
@ -11,8 +11,9 @@ arch=( x86_64 powerpc64le powerpc )
license=(BSD custom:PATENTS)
depends=(gcc-libs)
makedepends=(git cmake ninja doxygen)
[ "${CARCH}" == 'x86_64' ] && makedepends+=(yasm)
provides=(libaom.so)
_commit=bb35ba9148543f22ba7d8642e4fbd29ae301f5dc # tags/v2.0.0^0
_commit=b52ee6d44adaef8a08f6984390de050d64df9faa # tags/v2.0.1^0
source=("git+https://aomedia.googlesource.com/aom#commit=$_commit")
sha256sums=('SKIP')
@ -26,7 +27,7 @@ prepare() {
}
build() {
cmake -H$pkgname -Bbuild -G Ninja \
cmake -S $pkgname -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_SHARED_LIBS=1 \
-DENABLE_TESTS=0
@ -34,7 +35,7 @@ build() {
}
package() {
DESTDIR="$pkgdir" cmake --build build --target install
DESTDIR="$pkgdir" cmake --install build
mkdir -p "$pkgdir/usr/share/doc"
cp -r build/docs/html "$pkgdir/usr/share/doc/$pkgname"

43
apparmor/PKGBUILD
View File

@ -2,8 +2,8 @@
# Maintainer: David Runge <dvzrv@archlinux.org>
pkgname=apparmor
pkgver=3.0.0
pkgrel=2
pkgver=3.0.1
pkgrel=1
pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
arch=(x86_64 powerpc64le)
url="https://gitlab.com/apparmor/apparmor"
@ -20,23 +20,25 @@ backup=('etc/apparmor/easyprof.conf'
'etc/apparmor/logprof.conf'
'etc/apparmor/notify.conf'
'etc/apparmor/parser.conf'
'etc/apparmor/subdomain.conf'
'etc/apparmor/severity.db')
source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver%.[0-9]}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
"${pkgname}-3.0.0-utils_test.patch")
sha512sums=('2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6'
source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
"${pkgname}-3.0.1-python_ldflags.patch"
)
sha512sums=('e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687'
'SKIP'
'cc2048d9d43a15e7f429e022b352e15a023865f0e5babdec28eec943144ef2838b882d130bee4d40198b9c1b6dbb52f7ed6dc92f5824f8c5b18c3ebe46829149')
# AppArmor Development Team (AppArmor signing key) <apparmor@lists.ubuntu.com>
validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
export _core_perl="/usr/bin/core_perl"
export PATH=${PATH}:${_core_perl}
'04d313c5fd95e975e1df9313869166d7318560fc83218d8b0ae7c17fed31883d4a5f3334b3ad28d22864a1ac41a3ac846a38fbc6c59fec3bc6b111ddb0015890')
b2sums=('c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129'
'SKIP'
'0ba81da585d4aca8cf88c08e8350e35d84b2675d53d0f435bb309fc875ddcfd3245740494da24502d5ef77be13e63863d35c04461c4e6dd8ce3ef48e69b4536b')
validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB') # AppArmor Development Team (AppArmor signing key) <apparmor@lists.ubuntu.com>
_core_perl="/usr/bin/core_perl"
prepare() {
cd "${pkgname}-${pkgver}"
# fix issue with test trying to access /var/log/wtmp
# https://gitlab.com/apparmor/apparmor/-/issues/120
patch -Np1 -i "../${pkgname}-3.0.0-utils_test.patch"
# add missing LDFLAGS for python library
# https://gitlab.com/apparmor/apparmor/-/issues/129
patch -Np1 -i ../"${pkgname}-3.0.1-python_ldflags.patch"
# fix PYTHONPATH and add LD_LIBRARY_PATH for aa-logprof based check:
# https://gitlab.com/apparmor/apparmor/issues/39
@ -84,12 +86,13 @@ check() {
make -C binutils check
echo "INFO: Running check parser"
make -C parser check
# check-logprof (included in check) fails:
# https://gitlab.com/apparmor/apparmor/issues/36
# echo "INFO: Running check-logprof profiles"
# make -C profiles check-logprof
# NOTE: the profiles checks are notoriously broken, so run each separately
echo "INFO: Running check-abstractions.d profiles"
make -C profiles check-abstractions.d
# # many hardcoded paths are not accounted for:
# # https://gitlab.com/apparmor/apparmor/-/issues/137
# echo "INFO: Running check-logprof profiles"
# make -C profiles check-logprof
echo "INFO: Running check-parser profiles"
make -C profiles check-parser
echo "INFO: Running check utils"

12
apparmor/apparmor-3.0.1-python_ldflags.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am
--- a/libraries/libapparmor/swig/python/Makefile.am 2020-12-02 12:01:37.000000000 +0100
+++ b/libraries/libapparmor/swig/python/Makefile.am 2020-12-08 10:11:44.473385992 +0100
@@ -14,7 +14,7 @@
all-local: libapparmor_wrap.c setup.py
if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi
- CC="$(CC)" CFLAGS="$(PYTHON_CPPFLAGS) $(EXTRA_WARNINGS)" LDSHARED="$(CC) -shared" LDFLAGS="$(PYTHON_LDFLAGS)" $(PYTHON) setup.py build
+ CC="$(CC)" CFLAGS="$(PYTHON_CPPFLAGS) $(EXTRA_WARNINGS)" LDSHARED="$(CC) -shared" LDFLAGS="$(PYTHON_LDFLAGS) $(LDFLAGS)" $(PYTHON) setup.py build
install-exec-local:
$(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"

11
apparmor/cap.patch Normal file
View File

@ -0,0 +1,11 @@
--- parser/base_cap_names.h.orig 2020-11-12 09:47:13.681203238 +0000
+++ parser/base_cap_names.h 2020-11-12 09:46:32.423169987 +0000
@@ -8,6 +8,8 @@
{"bpf", CAP_BPF, NO_BACKMAP_CAP, CAPFLAG_BASE_FEATURE},
+{"checkpoint_restore", CAP_CHECKPOINT_RESTORE, NO_BACKMAP_CAP, CAPFLAG_BASE_FEATURE},
+
{"chown", CAP_CHOWN, NO_BACKMAP_CAP, CAPFLAG_BASE_FEATURE},
{"dac_override", CAP_DAC_OVERRIDE, NO_BACKMAP_CAP, CAPFLAG_BASE_FEATURE},

23
appstream/PKGBUILD
View File

@ -5,7 +5,7 @@
pkgbase=appstream
pkgname=(appstream appstream-qt)
pkgver=0.12.11
pkgver=0.13.1
pkgrel=1
pkgdesc="Provides a standard for creating app stores across distributions"
arch=( x86_64 powerpc64le powerpc )
@ -15,42 +15,33 @@ depends=(libyaml libxml2 libstemmer glib2 lmdb libsoup)
makedepends=(meson xmlto gobject-introspection gtk-doc qt5-tools itstool vala gperf)
source=("https://www.freedesktop.org/software/appstream/releases/AppStream-$pkgver.tar.xz"{,.asc}
update-appstream-cache.hook)
sha256sums=('194d871ae057c6bf2b5a95e98d77da2b0107996f593b2ac0b0b88fa8ba452f11'
sha256sums=('ba7de61223aaa76d8c47d8857bf185c28d4c2a099f3ab02c8837091e7e8f8626'
'SKIP'
'3a96a1479cfd18dad36c2ca3181aabe46af9bf772c00b965d86ec5f55cd0e0eb')
validpgpkeys=(D33A3F0CA16B0ACC51A60738494C8A5FBF4DECEB) # Matthias Klumpp <matthias@tenstral.net>
prepare() {
mkdir -p build
}
build() {
cd build
meson ../AppStream-$pkgver \
meson build AppStream-$pkgver \
--prefix=/usr \
-Dqt=true \
-Dvapi=true
ninja
ninja -C build
}
package_appstream() {
cd build
DESTDIR="$pkgdir" ninja install
DESTDIR="$pkgdir" ninja install -C build
# provided by -qt subpackage
rm -r "$pkgdir"/usr/{include/AppStreamQt,lib/cmake,lib/libAppStreamQt.*}
install -Dm644 "$srcdir"/update-appstream-cache.hook "$pkgdir"/usr/share/libalpm/hooks/update-appstream-cache.hook
install -Dm644 update-appstream-cache.hook "$pkgdir"/usr/share/libalpm/hooks/update-appstream-cache.hook
}
package_appstream-qt() {
pkgdesc='Qt5 interface for AppStream'
depends=(appstream qt5-base)
cd build
DESTDIR="$pkgdir" ninja install
DESTDIR="$pkgdir" ninja install -C build
# provided by appstream
rm -r "$pkgdir"{/etc,/usr/{bin,include/appstream,lib/{girepository-1.0,libappstream*,pkgconfig},share}}

22
archlinux-appstream-data/PKGBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Antonio Rojas <arojas@archlinux.org>
pkgname=archlinux-appstream-data
pkgver=20201020
pkgver=20201128
pkgrel=1
pkgdesc="Arch Linux application database for AppStream-based software centers"
arch=(any)
@ -19,18 +19,18 @@ for _repo in core extra community; do
$_repo-icons-128x128-$pkgver.tar.gz::https://sources.archlinux.org/other/packages/$pkgname/$pkgver/$_repo/icons-128x128.tar.gz)
noextract+=($_repo.xml.gz-$pkgver $_repo-icons-{48x48,64x64,128x128}-$pkgver.tar.gz)
done
sha256sums=('1ea18f23a03efe933230b7c3ec6b851efcdb567b5a5f6c986c080f2c51354bec'
sha256sums=('cad128d0211b7c0a070b9dcde63c86329fb2dae81fd40ceb5ecefd05cac56c90'
'7989bb311baa38ef545250282aa065d23281c46dfb8faabe4c653487bdbded5c'
'bef2363e0fa68db52563223aa5ea48baae1400f533bc6d0e532953847c15fbe4'
'283a80897bd70ee4e8757c393693635fc36b1973d325940f4f3079561cceed92'
'7989bb311baa38ef545250282aa065d23281c46dfb8faabe4c653487bdbded5c'
'b4c89c3af8cba3d54c11f9a707d68f2b95fd4ca0030033d2138413d1adb33c28'
'26f2dc39bb43bb5fd95bf0c186e0c90e990bef4cea5349f3a23a709e3e1229e4'
'576bde9ad84c272e1c154791266bb675008e715e7aff41343b42cc91651e49f9'
'ff7e3afb209db68f7362997f5ec5ad9150de779b23e1c969546ebda70be9e7f2'
'26552ebc0031350e0edd9953bfda821067edd0621f108a07407f50683598cea6'
'2abe9485f92b14aca730b4733845bee90bc226ea4fadc7c88e522777e8ac472e'
'329fd72433af51e89ab01da4efb3de9d24e03b7098f37c6e088b7300c112117e'
'f6780c67c400acb1309e9c17e763b2a33898e9bc04ad7f270c6b573073c105de')
'7287ce4bb231d771baa00a8c189310c01ef2bfadf3791963a044a20ef2f20a51'
'60d6ec4a41d6d5d1d94e260bff5cda3ae5d1d88de510ac1ee49cb5aaa4fb9822'
'1a00a8ff9059b7e5e10e2e751dbef4157247ec0490734daf354ae6e303e45f62'
'c10866bafa0d7fe6cfb466f046d419044f35d7697cf836bce3e09cfde1250c5e'
'b6cc45b43dca30b54a828bf222fef30d442197b52644a70db0215a40d7068b99'
'8d3c062de300c8a4feb1044be273c00b8a4f48d5f37011a51aa6e29f116fa2e1'
'787b7c1424fbfbfb26be76a324c15f66466e41abd98756c832bf37353e56b906'
'ed62defcb3a6e966732c963c13c606e90440cb37c5920957dc1e07c65960c1fc')
package() {
mkdir -p "$pkgdir"/usr/share/app-info/{icons/archlinux-arch-{core,extra,community}/{48x48,64x64,128x128},xmls}

36
aribb25/PKGBUILD Normal file
View File

@ -0,0 +1,36 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Contributor: Frederick Zhang <frederick888@tsundere.moe>
pkgname=aribb25
pkgver=0.2.7
pkgrel=2
pkgdesc='Library for ARIB STD-B25, decoding JIS 8 bit characters and parsing MPEG-TS stream'
url='https://code.videolan.org/videolan/aribb25'
arch=(x86_64 powerpc64le)
license=('custom:ISC')
depends=('glibc' 'pcsclite')
provides=('libaribb25.so')
source=("${url}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
sha512sums=('1f4f9aa40586d5984b30dd8972c258ef5003a60f2ab91ec56aff702be406e3d10a24868de0f188d215dbc497db23f734ffbcc8dcbc7b51de8edcfcbac7c0052e')
b2sums=('c3458f76fd43516e1b114d799e0455ee9adaa9aec627ec1444219e67a01bc89a9267c287da34696ee5b8564c107f9740353af2e7a9c3e4bdea218bbb24640f71')
prepare() {
cd ${pkgname}-${pkgver}
autoreconf -fiv
}
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
package() {
cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -Dm 644 README* -t "${pkgdir}/usr/share/doc/${pkgname}"
install -Dm 644 LICENCE -t "${pkgdir}/usr/share/licenses/${pkgname}"
}
# vim: ts=2 sw=2 et:

13
asciidoc/PKGBUILD
View File

@ -1,5 +1,6 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Contributor: Florian Pritz <flo@xinu.at>
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
@ -9,9 +10,9 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=asciidoc
pkgver=9.0.3
pkgrel=1
pkgdesc='Text document format for short documents, articles, books and UNIX man pages.'
pkgver=9.0.4
pkgrel=2
pkgdesc='Text document format for short documents, articles, books and UNIX man pages'
arch=('any')
url='https://asciidoc.org/'
license=('GPL')
@ -25,9 +26,9 @@ optdepends=('graphviz: graphviz-filter'
'fop: alternative pdf generation'
'w3m: text generation'
'lynx: alternative text generation')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asciidoc/asciidoc-py3/archive/${pkgver}.tar.gz")
sha256sums=('c0de1dcf111a200bf85bd81f67bc18778f839e55d761d6c7320095985524853a')
b2sums=('4e196bddfe400c3758086048089e3d316a8e7909f870b761e23506de8cd5b9871df8a0e1017fafbaa854711ab0d49efe4f8134453c02528ba8b6e1ac1cf0c0ff')
source=("https://github.com/asciidoc/asciidoc-py3/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
sha256sums=('9e269f336a71e8685d03a00c71b55ca029eed9f7baf1afe67c447be32206b176')
b2sums=('3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f')
prepare() {
cd ${pkgname}-py3-${pkgver}

2
asoundconf/PKGBUILD
View File

@ -5,7 +5,7 @@ pkgname=asoundconf
epoch=1
pkgver=1.2
_commit=55cdf2e78b7f28ee1808346e5d4e32f7e95618dc # 1.2
pkgrel=5
pkgrel=6
pkgdesc="utility to read and change the user's ALSA library configuration"
arch=('any')
url="https://bitbucket.org/stativ/asoundconf"

2
assimp/PKGBUILD
View File

@ -4,7 +4,7 @@
pkgname=assimp
pkgver=5.0.1
pkgrel=2
pkgrel=3
pkgdesc="Library to import various well-known 3D model formats in an uniform manner"
arch=( x86_64 powerpc64le powerpc )
license=('BSD')

34
atkmm/PKGBUILD
View File

@ -1,17 +1,19 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=atkmm
pkgname=(atkmm atkmm-docs)
pkgver=2.28.0
pkgrel=2
pkgver=2.28.1
pkgrel=1
pkgdesc="C++ bindings for ATK"
url="https://www.gtkmm.org/"
arch=(x86_64 powerpc64le)
license=(LGPL)
depends=(atk glibmm)
makedepends=(git mm-common perl glibmm-docs)
_commit=e1f4d5394a7982cc3c82ca63676a2928cd8819c1 # tags/2.28.0^0
makedepends=(git mm-common glibmm-docs meson)
options=(!emptydirs)
_commit=5d8721c5619b0d9c904f669f712db1d9ca7107f9 # tags/2.28.1^0
source=("git+https://gitlab.gnome.org/GNOME/atkmm.git#commit=$_commit")
sha256sums=('SKIP')
@ -22,26 +24,28 @@ pkgver() {
prepare() {
cd $pkgbase
NOCONFIGURE=1 ./autogen.sh
}
build() {
cd $pkgbase
./configure --prefix=/usr --enable-maintainer-mode
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
arch-meson $pkgbase build -D maintainer-mode=true
meson compile -C build
}
check() {
meson test -C build --print-errorlogs
}
package_atkmm() {
cd $pkgbase
sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
make DESTDIR="$pkgdir" install
DESTDIR="$pkgdir" meson install -C build
mkdir -p docs/usr/share
mv "$pkgdir"/usr/share/{devhelp,doc} docs/usr/share
}
package_atkmm-docs() {
pkgdesc+=" (documentation)"
depends=()
options=(!strip)
cd $pkgbase
make -C doc DESTDIR="$pkgdir" install
mv docs/* "$pkgdir"
}

12
audit/PKGBUILD
View File

@ -10,24 +10,28 @@
pkgbase=audit
pkgname=('audit' 'python-audit')
pkgver=2.8.5
pkgrel=8
pkgrel=9
pkgdesc='Userspace components of the audit framework'
url='https://people.redhat.com/sgrubb/audit'
arch=(x86_64 powerpc64le powerpc)
makedepends=('krb5' 'libcap-ng' 'libldap' 'swig' 'linux-headers' 'python')
license=('GPL')
options=('emptydirs')
source=(${pkgbase}-${pkgver}.tar.gz::https://people.redhat.com/sgrubb/audit/${pkgbase}-${pkgver}.tar.gz)
sha512sums=('7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a')
source=(${pkgbase}-${pkgver}.tar.gz::https://people.redhat.com/sgrubb/audit/${pkgbase}-${pkgver}.tar.gz
gcc10.patch)
sha512sums=('7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a'
'78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101')
prepare() {
cd ${pkgbase}-${pkgver}
sed 's|/var/run/auditd.pid|/run/auditd.pid|' -i init.d/auditd.service
# https://github.com/linux-audit/audit-userspace/issues/123
patch -Np1 -i ../gcc10.patch
}
build() {
cd ${pkgbase}-${pkgver}
CFLAGS+=' -fcommon' \
./configure \
--prefix=/usr \
--sbindir=/usr/bin \

23
audit/gcc10.patch Normal file
View File

@ -0,0 +1,23 @@
From 017e6c6ab95df55f34e339d2139def83e5dada1f Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@redhat.com>
Date: Fri, 10 Jan 2020 21:13:50 -0500
Subject: [PATCH] Header definitions need to be external when building with
-fno-common (which is default in GCC 10) - Tony Jones
---
src/ausearch-common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ausearch-common.h b/src/ausearch-common.h
index 6669203..3040547 100644
--- a/src/ausearch-common.h
+++ b/src/ausearch-common.h
@@ -50,7 +50,7 @@ extern pid_t event_pid;
extern int event_exact_match;
extern uid_t event_uid, event_euid, event_loginuid;
extern const char *event_tuid, *event_teuid, *event_tauid;
-slist *event_node_list;
+extern slist *event_node_list;
extern const char *event_comm;
extern const char *event_filename;
extern const char *event_hostname;

2
autoconf-archive/PKGBUILD
View File

@ -4,7 +4,7 @@
pkgname=autoconf-archive
pkgver=2019.01.06
pkgrel=2
pkgrel=4
epoch=1
pkgdesc="A collection of freely re-usable Autoconf macros"
arch=('any')

19
automake/PKGBUILD
View File

@ -4,8 +4,8 @@
# Contributor: judd <jvinet@zeroflux.org>
pkgname=automake
pkgver=1.16.2
pkgrel=3
pkgver=1.16.3
pkgrel=1
pkgdesc="A GNU tool for automatically creating Makefiles"
arch=('any')
license=('GPL')
@ -19,22 +19,13 @@ checkdepends=('dejagnu' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope'
# fixes for current texlive release
#'texlive-bin' 'texinfo'
'python' 'python-virtualenv')
source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
test_vala-mix2.sh.diff)
sha512sums=('a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b'
'SKIP'
'e6cc9cb41cfd10cbd4ab0263859bfa8c892112c68a69043601c6d7da7c70300ccfe29b242a597bdf6c00bf14c12c19180eedbd66e80ae2bbea9513e36d999108')
source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
sha512sums=('7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa'
'SKIP')
validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573' # Stefano Lattarini
'F2A38D7EEB2B66405761070D0ADEE10094604D37' # Mathieu Lirzin
'155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering
prepare() {
# upstream suggested gcc10 fix for failing test
# https://lists.gnu.org/archive/html/bug-automake/2020-06/msg00003.html
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i ../test_vala-mix2.sh.diff
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --build=$CHOST --prefix=/usr

2
avogadrolibs/PKGBUILD
View File

@ -3,7 +3,7 @@
pkgname=avogadrolibs
pkgver=1.93.0
pkgrel=4
pkgrel=5
pkgdesc="Libraries that provide 3D rendering, visualization, analysis and data processing useful in computational chemistry, molecular modeling, bioinformatics, materials science, and related areas"
arch=( x86_64 powerpc64le powerpc )
url="https://www.openchemistry.org/"

74
bash/PKGBUILD
View File

@ -1,19 +1,21 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Maintainer: Giancarlo Razzolini <grazzolini@archlinux.org>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=bash
_basever=5.0
_patchlevel=018
_basever=5.1
_patchlevel=0
pkgver=${_basever}.${_patchlevel}
pkgrel=1
pkgrel=2
pkgdesc='The GNU Bourne Again shell'
arch=(x86_64 powerpc64le powerpc)
license=(GPL)
url='https://www.gnu.org/software/bash/bash.html'
backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
depends=('readline>=7.0' glibc ncurses)
depends=(readline libreadline.so glibc ncurses)
optdepends=('bash-completion: for tab completion')
provides=('sh')
source=(https://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
@ -34,7 +36,7 @@ prepare() {
cd $pkgname-$_basever
for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do
msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)"
echo "applying patch bash${_basever//.}-$(printf "%03d" $_p)"
patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p)
done
}
@ -49,8 +51,12 @@ build() {
-DNON_INTERACTIVE_LOGIN_SHELLS)
export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
./configure --prefix=/usr --with-curses --enable-readline \
--without-bash-malloc --with-installed-readline
./configure \
--prefix=/usr \
--with-curses \
--enable-readline \
--without-bash-malloc \
--with-installed-readline
make
}
@ -73,46 +79,12 @@ package() {
install -m644 dot.bash_logout "$pkgdir/etc/skel/.bash_logout"
}
md5sums=('2b44b47b905be16f45709648f671820b'
'SKIP'
'027d6bd8f5f6a06b75bb7698cb478089'
'2902e0fee7a9168f3a4fd2ccd60ff047'
'42f4400ed2314bd7519c020d0187edc5'
'd8f3f334e72c0e30032eae1a1229aef1'
'472f536d7c9e8250dc4568ec4cfaf294'
'b026862ab596a5883bb4f0d1077a3819'
'SKIP'
'2f4a7787365790ae57f36b311701ea7e'
'SKIP'
'af7f2dd93fd5429fb5e9a642ff74f87d'
'SKIP'
'b60545b273bfa4e00a760f2c648bed9c'
'SKIP'
'875a0bedf48b74e453e3997c84b5d8a4'
'SKIP'
'4a8ee95adb72c3aba03d9e8c9f96ece6'
'SKIP'
'411560d81fde2dc5b17b83c3f3b58c6f'
'SKIP'
'dd7cf7a784d1838822cad8d419315991'
'SKIP'
'c1b3e937cd6dccbb7fd772f32812a0da'
'SKIP'
'19b41e73b03602d0e261c471b53e670c'
'SKIP'
'414339330a3634137081a97f2c8615a8'
'SKIP'
'1870268f62b907221b078ad109e1fa94'
'SKIP'
'40d923af4b952b01983ed4c889ae2653'
'SKIP'
'57857b22053c8167677e5e5ac5c6669b'
'SKIP'
'c4c6ea23d09a74eaa9385438e48fdf02'
'SKIP'
'a682ed6fa2c2e7a7c3ba6bdeada07fb5'
'SKIP'
'd9dcaa1d8e7a24850449a1aac43a12a9'
'SKIP'
'a64d950d5de72ae590455b13e6afefcb'
'SKIP')
sha256sums=('cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa'
'SKIP'
'3e22bf86ae6708df7a6bceb88c67a00118275f9c0b5268f453dd388af7c43b53'
'e149407c2bee17779caec70a7edd3d0000d172e7e4347429b80cb4d55bcec9c2'
'4330edf340394d0dae50afb04ac2a621f106fe67fb634ec81c4bfb98be2a1eb5'
'5fdc20c44bc9058f728d11111327f4dbb5598fec4d948dd5265211598667f9f0'
'025bccfb374a3edce0ff8154d990689f30976b78f7a932dc9a6fcef81821811e')
# vim: ts=2 sw=2 et:

4
bctoolbox/PKGBUILD
View File

@ -3,7 +3,7 @@
# Contributor: Sergej Pupykin <arch+pub@sergej.pp.ru>
pkgname=bctoolbox
pkgver=4.4.6
pkgver=4.4.17
pkgrel=1
pkgdesc="A library written in C that allows you to create and run audio and video streams"
arch=(x86_64 powerpc64le)
@ -12,7 +12,7 @@ license=(GPL)
depends=(mbedtls bcunit)
makedepends=(cmake)
source=($pkgname-$pkgver.tar.gz::"https://github.com/BelledonneCommunications/bctoolbox/archive/$pkgver.tar.gz")
sha256sums=('2e26112b4d07fd55530f3c5948ed002e9a5610fe3bbbc218d93d1f2d6fa0d05b')
sha256sums=('1364d5f42b5514546b9c6654c227804ff92cf9cf13fdc7cb6ca666e3bb5a7987')
build() {
cmake -B build -S $pkgname-$pkgver \

6
beanshell/PKGBUILD
View File

@ -2,8 +2,8 @@
# Maintainer: AndyRTR <andyrtr at archlinux.org>
pkgname=beanshell
pkgver=2.0b6
pkgrel=3
pkgver=2.1.0
pkgrel=1
pkgdesc="Small, free, embeddable, source level Java interpreter with object based scripting language features written in Java"
arch=('any')
url="https://github.com/beanshell/beanshell"
@ -14,7 +14,7 @@ replaces=('beanshell2')
conflicts=('beanshell2')
source=("https://github.com/beanshell/beanshell/releases/download/$pkgver/bsh-${pkgver}.jar")
noextract=("${pkgname}-${pkgver}.jar")
sha1sums=('fb418f9b33a0b951e9a2978b4b6ee93b2707e72f')
sha512sums=('f29ec0b382e8648b9f7506cc976ac533d82a941986e0beab3464cd1659334d8f8369c139124591ba45306dc8c0eb7090bd915ece364cdd476dd929fde3da2c34')
# beanshell2 fork is dead
# http://stackoverflow.com/questions/26549307/current-state-of-beanshell

35
blender/D8355-ffmpeg43.patch
View File

@ -1,35 +0,0 @@
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -1205,7 +1205,29 @@
}
IMB_freeImBuf(anim->last_frame);
- anim->last_frame = IMB_allocImBuf(anim->x, anim->y, 32, IB_rect);
+
+ /* Certain versions of FFmpeg have a bug in libswscale which ends up in crash
+ * when destination buffer is not properly aligned. For example, this happens
+ * in FFmpeg 4.3.1. It got fixed later on, but for compatibility reasons is
+ * still best to avoid crash.
+ *
+ * This is achieved by using own allocation call rather than relying on
+ * IMB_allocImBuf() to do so since the IMB_allocImBuf() is not guaranteed
+ * to perform aligned allocation.
+ *
+ * In theory this could give better performance, since SIMD operations on
+ * aligned data are usually faster.
+ *
+ * Note that even though sometimes vertical flip is required it does not
+ * affect on alignment of data passed to sws_scale because if the X dimension
+ * is not 32 byte aligned special intermediate buffer is allocated.
+ *
+ * The issue was reported to FFmpeg under ticket #8747 in the FFmpeg tracker
+ * and is fixed in the newer versions than 4.3.1. */
+ anim->last_frame = IMB_allocImBuf(anim->x, anim->y, 32, 0);
+ anim->last_frame->rect = MEM_mallocN_aligned((size_t)4 * anim->x * anim->y, 32, "ffmpeg ibuf");
+ anim->last_frame->mall |= IB_rect;
+
anim->last_frame->rect_colorspace = colormanage_colorspace_get_named(anim->colorspace);
ffmpeg_postprocess(anim);

26
blender/PKGBUILD
View File

@ -8,19 +8,18 @@
# fine with them.
pkgname=blender
pkgver=2.90.1
pkgrel=2
pkgver=2.91.0
pkgrel=6
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=(x86_64 powerpc64le)
license=('GPL')
url="http://www.blender.org"
depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requests'
depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requests' 'potrace'
'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg2' 'python-numpy'
'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'alembic'
'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'alembic' 'openxr'
'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2')
makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'ninja')
options=(!strip)
source=("git://git.blender.org/blender.git#tag=v$pkgver"
@ -28,16 +27,12 @@ source=("git://git.blender.org/blender.git#tag=v$pkgver"
"git://git.blender.org/blender-addons-contrib.git"
"git://git.blender.org/blender-translations.git"
"git://git.blender.org/blender-dev-tools.git"
https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/91aeb452ab251b307311fe869e8e14df945ec6bc
cuda11.patch
https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip)
sha512sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
'46358fe7dab620eb9a7414baa851e7d28818b7c2845f723f7dd0f4b0f721902583a6b57c9c2d5e153c5057cc958727489d301c5195dfd3befee96cde539d813a'
'76d55f49cf0475d3050a3ff534da47345aae862fd5ee0e336143c041ef58c5d4ebd6e922eb8a23c01cc35d19537c46698910b0b52a090cdcea4e5f67e4fb5650'
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491')
case "${CARCH}" in
@ -46,6 +41,7 @@ case "${CARCH}" in
depends+=('embree' 'openimagedenoise')
# no support for Cuda on non-x86 yet
makedepends+=('cuda')
optdepends=('cuda: cycles renderer cuda support')
CMAKE_EXTRA_FLAGS="-DWITH_CYCLES_EMBREE=ON"
;;
# the rest of the world
@ -53,6 +49,7 @@ case "${CARCH}" in
CMAKE_EXTRA_FLAGS="-DWITH_CYCLES=OFF -DWITH_CYCLES_EMBREE=OFF"
esac
prepare() {
cd "$pkgname"
@ -63,9 +60,6 @@ prepare() {
git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
git submodule update
git submodule foreach git checkout v${pkgver}
patch -Np1 -i "$srcdir"/91aeb452ab251b307311fe869e8e14df945ec6bc
patch -Np1 -i "$srcdir"/cuda11.patch
}
build() {
@ -80,11 +74,11 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
-DPYTHON_VERSION=3.8 \
-DPYTHON_VERSION=3.9 \
-DPYTHON_LIBPATH=/usr/lib \
-DPYTHON_LIBRARY=python3.8 \
-DPYTHON_INCLUDE_DIRS=/usr/include/python3.8 ${CMAKE_EXTRA_FLAGS}
ninja -C build
-DPYTHON_LIBRARY=python3.9 \
-DPYTHON_INCLUDE_DIRS=/usr/include/python3.9 ${CMAKE_EXTRA_FLAGS}
ninja -C build ${MAKEFLAGS}
}
package() {

1494
blender/blender-2.80-python-3.8.patch
View File

File diff suppressed because it is too large Load Diff

19
botan/PKGBUILD
View File

@ -8,8 +8,8 @@
# Contributor: Jack Lloyd <jack@randombit.net>
pkgname=botan
pkgver=2.16.0
pkgrel=2
pkgver=2.17.2
pkgrel=3
pkgdesc='Crypto library written in C++'
arch=( x86_64 powerpc64le powerpc )
url='https://botan.randombit.net/'
@ -17,17 +17,10 @@ license=(BSD)
depends=(xz sqlite)
makedepends=(python boost openssl)
optdepends=('python: for using botan2.py' 'boost-libs: for the botan executable')
validpgpkeys=('621DAF6411E1851C4CF9A2E16211EBF1EFBADFBC')
source=("https://botan.randombit.net/releases/Botan-${pkgver}.tar.xz"{,.asc}
botan-ldflags.patch)
sha256sums=('92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628'
'SKIP'
'a6e85d537f9a1299be8a6763df09c1b90680f5efd92c42a53ff0f985c82b3000')
prepare() {
cd ${pkgname^}-$pkgver
patch -p1 -i ../botan-ldflags.patch # Fix --as-needed
}
source=("https://botan.randombit.net/releases/Botan-${pkgver}.tar.xz"{,.asc})
sha256sums=('ebe27dfe2b55d7e02bf520e926606c48b76b22facb483256b13ab38e018e1e6c'
'SKIP')
validpgpkeys=('621DAF6411E1851C4CF9A2E16211EBF1EFBADFBC') # Botan Distribution Key
build() {
cd "${pkgname^}-$pkgver"

6
breezy/PKGBUILD
View File

@ -3,8 +3,8 @@
# Contributor: Adam Fontenot <adam.m.fontenot@gmail.com>
pkgname=breezy
pkgver=3.1.0.5
pkgrel=1
pkgver=3.1.0.6
pkgrel=3
pkgdesc='A decentralized revision control system with support for Bazaar and Git file formats'
arch=( x86_64 powerpc64le powerpc )
url=https://www.breezy-vcs.org/
@ -33,7 +33,7 @@ optdepends=(
provides=(bzr)
conflicts=(bzr)
replaces=(bzr)
_tag=4faff75069ab640f856215583ac1e61544f9356a
_tag=1a47e5bffea5059864a2cc278ff98a5ecc5b039b
source=(git+https://github.com/breezy-team/breezy.git#tag=${_tag})
sha256sums=(SKIP)

2
brotli/PKGBUILD
View File

@ -9,7 +9,7 @@ pkgbase=brotli
pkgname=('brotli' 'python-brotli' 'brotli-testdata')
_gitcommit=e61745a6b7add50d380cfd7d3883dd6c62fc2c71
pkgver=1.0.9
pkgrel=2
pkgrel=4
pkgdesc='Generic-purpose lossless compression algorithm'
url='https://github.com/google/brotli'
arch=( x86_64 powerpc64le powerpc )

2
btrfs-progs/PKGBUILD
View File

@ -5,7 +5,7 @@
pkgname=btrfs-progs
pkgver=5.9
pkgrel=1
pkgrel=3
pkgdesc='Btrfs filesystem utilities'
arch=( x86_64 powerpc64le powerpc )
makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools' 'e2fsprogs' 'reiserfsprogs')

4
bzrtp/PKGBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Antonio Rojas <arojas@archlinux.org>
pkgname=bzrtp
pkgver=4.4.0
pkgver=4.4.17
pkgrel=1
pkgdesc="Opensource implementation of ZRTP keys exchange protocol"
arch=(x86_64 powerpc64le)
@ -11,7 +11,7 @@ license=(GPL2)
depends=(libxml2 bctoolbox sqlite)
makedepends=(bcunit cmake)
source=("$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bzrtp/archive/$pkgver.tar.gz")
sha256sums=('5fc501c742f38661b5ac8904e6a66f530b07be93d7493663daab33f3d4ffdb6c')
sha256sums=('8cfb6f8be7be64046982849aaa48020caf5c6f1ab9cd9422af6082dfd669267d')
build() {
cmake -B build -S $pkgname-$pkgver \

46
c-ares/PKGBUILD
View File

@ -1,35 +1,41 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: David Runge <dvzrv@archlinux.org>
# Contributor: Dave Reisner <dreisner@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Contributor: Jeff Mickey <jeff@archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
pkgname=c-ares
pkgver=1.16.1
pkgrel=2
pkgdesc='C library that performs DNS requests and name resolves asynchronously'
arch=( x86_64 powerpc64le powerpc )
url='https://c-ares.haxx.se/'
license=('custom')
pkgver=1.17.1
pkgrel=1
pkgdesc="A C library for asynchronous DNS requests"
arch=(x86_64 powerpc64le powerpc)
url="https://c-ares.haxx.se/"
license=('MIT')
depends=('glibc')
source=("https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
'LICENSE')
sha512sums=('4ac2a5d5c6da74eb1d6155c4eadc7127ab1b53a8d13caec41bd6172db5417a79f3ab022e77ba37d8b13da6893d7ced5fd8baf5cc3950a4154b4de8743ad31471'
'SKIP'
'55e8607392c5f82ed85e3580fa632dfdc2dcd0b1a5e918dc61d00532c15c11ecb709f6007b65805c1fbe8fcd21ee794c9e4a9638c97ac1f4960b2654010a4d0a')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg
'914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg
makedepends=('cmake')
provides=('libcares.so')
source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgname//-}-${pkgver//./_}/${pkgname}-${pkgver}.tar.gz"{,.asc})
sha512sums=('b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00'
'SKIP')
b2sums=('31dac21ecae231e2a201dc1ba954c1a0663a06f93eb8e7e033ca3c6d385f53e07af0b04854739f1ee8a7f0693f67f620143e152ef092b49342c62279a0480905'
'SKIP')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg <daniel@haxx.se>
build() {
cd "$pkgname-$pkgver"
./configure --prefix=/usr --enable-shared
make
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE='None' \
-Wno-dev \
-B build \
-S .
make VERBOSE=1 -C build
}
package() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
make DESTDIR="${pkgdir}" install -C build
install -vDm 644 "LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}/"
install -vDm 644 {AUTHORS,CHANGES,{CONTRIBUTING,README}.md,RELEASE-NOTES} \
-t "${pkgdir}/usr/share/doc/${pkgname}/"
}

62
cairo/PKGBUILD
View File

@ -1,20 +1,23 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Brice Carpentier <brice@daknet.org>
pkgname=cairo
pkgver=1.17.2+25+gaee96d175
pkgver=1.17.4
pkgrel=3
pkgdesc="2D graphics library with support for multiple output devices"
url="https://cairographics.org/"
arch=( x86_64 powerpc64le powerpc )
license=(LGPL MPL)
depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
checkdepends=(ttf-dejavu gsfonts)
_commit=aee96d175d8349945a6d1948a56abd4b4ec6ad84 # master
source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
sha256sums=('SKIP')
depends=(lzo zlib libpng fontconfig freetype2 libx11 libxext libxrender libxcb
glib2 pixman)
makedepends=(valgrind git meson)
_commit=156cd3eaaebfd8635517c2baf61fcf3627ff7ec2 # tags/1.17.4^0
source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit"
xlib-xcb.diff)
sha256sums=('SKIP'
'70cd3783381bf73ea7fccd5c2db43956b10865a9c54d5edd251dbcdb9b595a43')
pkgver() {
cd cairo
@ -24,44 +27,23 @@ pkgver() {
prepare() {
cd cairo
# Update gtk-doc
cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4
cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc
# Fix library versioning
# https://bugs.archlinux.org/task/69012
git cherry-pick -n e9ccb1d8d095482e4139da658e679d5aad56b184
# Fix typo
sed -i 's/have_png/use_png/g' configure.ac
NOCONFIGURE=1 ./autogen.sh
# Disable XCB backend for Xlib surfaces
# https://bugs.archlinux.org/task/68839
git apply -3 ../xlib-xcb.diff
}
build() {
cd cairo
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
--disable-gl \
--enable-tee \
--enable-svg \
--enable-ps \
--enable-pdf \
--enable-gobject \
--enable-gtk-doc \
--enable-full-testing \
--enable-test-surfaces
sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
check() {
cd cairo
# FIXME: tests don't pass
env CAIRO_TEST_TARGET=image \
CAIRO_TEST_TARGET_FORMAT=rgba \
CAIRO_TESTS='!pthread-show-text' make -k check || :
arch-meson cairo build \
-D spectre=disabled \
-D tee=enabled \
-D tests=disabled
meson compile -C build
}
package() {
cd cairo
make DESTDIR="$pkgdir" install
DESTDIR="$pkgdir" meson install -C build
}

25
cairo/xlib-xcb.diff Normal file
View File

@ -0,0 +1,25 @@
diff --git i/meson.build w/meson.build
index b159b4071..2a1c68891 100644
--- i/meson.build
+++ w/meson.build
@@ -313,7 +313,7 @@ endif
if feature_conf.get('CAIRO_HAS_XCB_SURFACE', 0) == 1 and feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1
# FIXME: automagic
- x11xcb_dep = dependency('x11-xcb', required: false)
+ x11xcb_dep = dependency('x11-xcb', required: get_option('xlib-xcb'))
if x11xcb_dep.found()
deps += [x11xcb_dep]
feature_conf.set('CAIRO_HAS_XLIB_XCB_FUNCTIONS', 1)
diff --git i/meson_options.txt w/meson_options.txt
index ff11fe7ed..d1ae959e1 100644
--- i/meson_options.txt
+++ w/meson_options.txt
@@ -17,6 +17,7 @@ option('qt', type : 'feature', value : 'disabled')
option('tee', type : 'feature', value : 'disabled')
option('xcb', type : 'feature', value : 'auto')
option('xlib', type : 'feature', value : 'auto')
+option('xlib-xcb', type : 'feature', value : 'disabled')
#option('xml', type : 'feature', value : 'disabled')
option('zlib', type : 'feature', value : 'auto') # script, ps, pdf, xml surfaces

8
cargo-c/PKGBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=cargo-c
pkgver=0.6.15
pkgver=0.6.18
pkgrel=1
pkgdesc='A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries'
arch=( x86_64 powerpc64le powerpc )
@ -10,10 +10,10 @@ url='https://github.com/lu-zero/cargo-c/'
license=('MIT')
depends=('curl' 'openssl' 'zlib')
makedepends=('rust')
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/lu-zero/cargo-c/archive/v${pkgver}.tar.gz"
source=("https://github.com/lu-zero/cargo-c/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
"${pkgname}-${pkgver}.Cargo.lock"::"https://github.com/lu-zero/cargo-c/releases/download/v${pkgver}/Cargo.lock")
sha256sums=('528d2a66d1b866e2d860e42a0c9184b75873539cb86ece948c00f4b3bd5028fa'
'6dfd7a9d7989b331fedf8a45e79fb8471eef69e7b32fa8d74795368db5360b67')
sha256sums=('f6611f9d6914e6972bf9544064f9306a71d1cfb4bc8971e85415588770b81f35'
'914ae844e9aa0413d079ef92eee116ac6d7f2ace086535b8a7512851ababbcc0')
prepare() {
ln -sf "../${pkgname}-${pkgver}.Cargo.lock" "${pkgname}-${pkgver}/Cargo.lock"

4
catch2/PKGBUILD
View File

@ -4,8 +4,8 @@
# Contributor: Bart Verhagen <barrie.verhagen at gmail dot com>
pkgname=catch2
_gitcommit=fd9f5ac661f87335ecd70d39849c1d3a90f1c64d
pkgver=2.13.1
_gitcommit=ff349a50bfc6214b4081f4ca63c7de35e2162f60
pkgver=2.13.3
pkgrel=1
pkgdesc="Modern, C++-native, header-only, test framework for unit-tests, TDD and BDD"
arch=('any')

3
cdrtools/PKGBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=cdrtools
pkgver=3.02a09
pkgrel=3
pkgrel=4
pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning"
arch=(x86_64 powerpc64le)
url="http://cdrecord.org/"
@ -15,6 +15,7 @@ options=(!makeflags)
backup=('etc/default/cdrecord' 'etc/default/rscsi')
source=(https://downloads.sourceforge.net/cdrtools/cdrtools-$pkgver.tar.bz2)
sha256sums=('aa28438f458ef3f314b79f2029db27679dae1d5ffe1569b6de57742511915e81')
install=cdrtools.install
build() {
cd "$srcdir"/cdrtools-${pkgver%%a*}

5
cdrtools/cdrtools.install Normal file
View File

@ -0,0 +1,5 @@
post_install() {
setcap cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep /usr/bin/cdrecord
setcap cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep /usr/bin/cdda2wav
setcap cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep /usr/bin/readcd
}

171
ceph/PKGBUILD
View File

@ -4,29 +4,29 @@
pkgbase='ceph'
pkgname=('ceph' 'ceph-libs' 'ceph-mgr')
_zstdver=1.4.4
pkgver=14.2.8
pkgrel=1
_zstdver=1.4.5
pkgver=15.2.7
pkgrel=3
pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
arch=(x86_64 powerpc64le)
url='https://ceph.com/'
license=('GPL')
makedepends=("zstd=${_zstdver}" 'bc' 'boost' 'boost-libs' 'cmake' 'coffeescript'
makedepends=("zstd=${_zstdver}" 'bash' 'bc' 'boost' 'boost-libs' 'bzip2' 'c-ares' 'cmake' 'coreutils' 'coffeescript'
'cpio' 'crypto++' 'cryptsetup' 'cunit' 'curl' 'cython' 'expat'
'fcgi' 'fontconfig' 'fuse2' 'gcc' 'gcc-libs' 'git' 'glibc' 'gmock'
'gperf' 'gperftools' 'gptfdisk' 'gtest' 'inetutils' 'java-runtime'
'fcgi' 'fontconfig' 'fuse2' 'fuse3' 'fmt' 'gcc' 'gcc-libs' 'git' 'glibc' 'gmock' 'gnutls'
'gperf' 'gperftools' 'gptfdisk' 'gtest' 'hwloc' 'inetutils' 'java-runtime'
'jq' 'jre11-openjdk-headless' 'junit' 'keyutils' 'leveldb' 'libaio'
'libatomic_ops' 'libcap' 'libcap-ng' 'libcroco' 'libcurl-compat'
'libedit' 'libgudev' 'librabbitmq-c' 'libtool' 'libutil-linux'
'libuv' 'libxml2' 'lsb-release' 'lz4' 'ncurses' 'npm'
'nss' 'oath-toolkit' 'openssl' 'parted' 'pcre' 'pcre2' 'pkgconf'
'procps-ng' 'python-astroid' 'python-attrs' 'python-bcrypt'
'python-cheroot' 'python-cherrypy' 'python-coverage'
'libedit' 'libgudev' 'libnl' 'librabbitmq-c' 'libtool' 'util-linux'
'libuv' 'libxml2' 'librdkafka' 'libpciaccess' 'lsb-release' 'lz4' 'ncurses'
'nss' 'numactl' 'oath-toolkit' 'openssl' 'parted' 'pcre' 'pcre2' 'pkgconf' 'protobuf'
'procps-ng' 'python-astroid' 'python-attrs' 'python-bcrypt' 'python-breathe'
'python-cheroot' 'python-cherrypy' 'python-coverage' 'python-dateutil'
'python-elasticsearch' 'python-flask' 'python-flask-restful'
'python-google-api-python-client' 'python-google-auth'
'python-google-auth-httplib2' 'python-grpcio' 'python-isort'
'python-jinja' 'python-lazy-object-proxy' 'python-mccabe'
'python-isodate' 'python-defusedxml' 'python-pkgconfig'
'python-isodate' 'python-defusedxml' 'python-pkgconfig' 'python-protobuf'
'python-lxml' 'python-xmlsec' 'python-yaml'
'python-more-itertools' 'python-numpy' 'python-pbr' 'python-pecan'
'python-pip' 'python-pluggy' 'python-portend' 'python-prettytable'
@ -36,28 +36,45 @@ makedepends=("zstd=${_zstdver}" 'bc' 'boost' 'boost-libs' 'cmake' 'coffeescript'
'python-setuptools' 'python-six' 'python-sphinx' 'python-tempora'
'python-virtualenv' 'python-werkzeug' 'python-wrapt' 'rabbitmq'
'sed' 'snappy' 'socat' 'systemd' 'systemd-libs' 'valgrind'
'xfsprogs' 'xmlstarlet' 'xxhash' 'zlib' )
'xfsprogs' 'xmlstarlet' 'xmlsec' 'xxhash' 'yaml-cpp' 'zlib' )
[ "${CARCH}" == 'x86_64' ] && makedepends+=('yasm')
checkdepends=('python-mock' 'python-nose' 'python-pycodestyle' 'python-pylint'
'python-pytest' 'python-pytest-cov')
options=('emptydirs')
source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
'ceph.sysusers'
'remove-distro-version-detection.patch'
'disable-empty-readable.sh-test.patch'
'use-threadsafe-death-tests-objectstore-memstore.patch'
'use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch'
'suppress-pylint-warnings.patch'
'fix-mgr-dashboard-frontend-unittests-dist-stuff.patch'
"zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz")
sha512sums=('38b0c6df58579377528c8f8e06d0cbc40f471f6eb2fb4a05b395f6fddbd3f2117674545b2147d8730973b01967ddcd4322a769ba03f9c625417ed35cc39f195a'
source=(
"https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
'ceph.sysusers'
"zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz"
'glibc2.32-strsignal-compat-backported.patch'
'ceph-14.2.0-cflags.patch'
'ceph-12.2.4-boost-build-none-options.patch'
'ceph-13.2.0-cflags.patch'
'ceph-13.2.2-dont-install-sysvinit-script.patch'
'ceph-14.2.0-link-crc32-statically.patch'
'ceph-14.2.0-cython-0.29.patch'
'ceph-15.2.0-rocksdb-cmake.patch'
'ceph-15.2.4-system-uring.patch'
'ceph-15.2.5-missing-includes.patch'
'disable-empty-readable.sh-test.patch'
'qa-src-update-mypy-to-0.782.patch'
'mgr-dashboard-update-pylint-to-2.6.0.patch'
)
sha512sums=('bfe07cefcd603d773216a2b1d49fb32bdf1185dfb69b30d5362eb48d3afa2984cebffb598f7d68bfbd9afdc2f29975130a585a9b83724ca6a3f59163895c0de0'
'4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
'02c9e8fd3c23fb4c9c4c576ee6d06e8525ca31decfd964fb7231e73c98fe2987a483dda680969752186f0918f47d9af4fb09a4901e5319077f45d870906716da'
'b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387'
'f4f725db5ce8ff01088557891382f28b014a18accbca40b9939899e611377dc71bc94aa47333bbff544b65a7f7cb680bac4a1359481afe24354a0b5c4a9469e4'
'9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94'
'6ff46a90d76f667fa23be0f9eb1ed2fb7e30af9a2621aec19944d0a22a431a0f5721603c588286e483ff55c14aac920adfccb039c9678a87cc59640dd70367ae'
'8ec0d668fefee12d2c7f5b5297dd81fc6a559f5823d069e6395d9b4240110eb8f95049d3054697a459948c1f3784b4450539849cf9d7f3b1aa1c7fbd96c475df'
'ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e'
'3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d'
'82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d'
'20256de5c3227caa149f8285bcc90fcbd67be8cefa568fb72ad0d43688f1f62db7c7fc231dfd4ecf2dd11be68bf1ccc284ebbc691a82a26f3968200f12c82097'
'8258661e56b5360f4260fdd29b07bac4d415068a112b61ca8c55c529fb1593d8d61a0d59a4eec8f1567b97167c058082198d008f55f8ee701cb46489df5f7823'
'84de66f64ea96cd59b40dfb5b8c5d093fe49df1139b45ad9d1bd6b9ebd2f1200b6e931adcf032639a4995af322cf05c1ef9050eb1cb6673e29e040d4e348b3d5'
'2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
'a74aea7c0b0d1883c874f889c184bd2c766fa578d6ca0cbe5eaada840281bb947b3d80f142b30473058cd2652d2967d241ade6914d6be50e93e91728a31733c8'
'4345fc2f422c7c1910bfd4068ad39511fa63d8c1e4fc04af416bb0f3869e43327d4a4bfc980d5abf273693a532ac153ed1e4c03e033a127692c1254b99092b8a'
'4afd5c3b49a839531921e80b1204ef5b496531a31b3de13042bfcbb548d736851ef7698e41bc94a9bed356e7c2cab6bf30bc711796249cf10ee791974033c29b'
'6265e083e0e8cba481741c7492a47e8144381287c2cbaef220a64bd889d8bac43cb5cc3efb01600cf785d585c950982a908deed10bedf0688c5cd2015e004c1f'
'8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf')
'204741c65b8ceeddae0a58a49e2b4249ee7ffc624ce8d9faa6284af198abe63bffb6758e064eeff6d1857be044647f99749a45443e258b35e92cc36b9edeba80'
'f65a028832a7d8ec6db55b4399c4448f0f7182031d81c239e3d7a04d2d27394481af2e4313bcff54c775934389773658b0bb0574107677f377e581bd51876d59')
# -fno-plt causes linker errors (undefined reference to internal methods)
@ -65,34 +82,44 @@ sha512sums=('38b0c6df58579377528c8f8e06d0cbc40f471f6eb2fb4a05b395f6fddbd3f211767
# https://github.com/intel/media-driver/commit/d95d8f7ab7ac94a2e0f4ee6a4b4794898dc2d3b7
# as of today (2019-07-12) the upstream maintainers do not consider this a bug in their code
# (IMHO rightfully so) and thus we strip the option here
CFLAGS="${CFLAGS/-fno-plt/}"
CXXFLAGS="${CXXFLAGS/-fno-plt/}"
export CFLAGS="${CFLAGS/-fno-plt/}"
export CXXFLAGS="${CXXFLAGS/-fno-plt/}"
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
# the src/pybind/mgr/dashboard/run-frontend-unittests.sh helper will incorrectly
# rebuild the static assets to frontend/dist/ causing failures in run-tox-mgr-dashboard
# and in the final package
# with fix-mgr-dashboard-frontend-unittests-dist-stuff.patch we comment out
# the npm build and i18n commands of this helper and just use the remainder to run the actual tests
# apply patches from the source array
local filename
for filename in "${source[@]}"; do
for filename in "${source[@]%%::*}"; do
if [[ "${filename}" =~ \.patch$ ]]; then
msg2 "Applying patch ${filename##*/}"
echo "Applying patch ${filename##*/}"
patch -p1 -N -i "${srcdir}/${filename##*/}"
fi
done
# temporarily disable unsubscriptable-object (buggy on Python 3.9)
# https://github.com/PyCQA/pylint/issues/3882
sed -i '/^disable=/a\ unsubscriptable-object,' \
src/pybind/mgr/dashboard/.pylintrc
# mypy complains about this but the exception is handled; not sure what's up
sed -i 's/from base64 import encodestring$/& # type: ignore/' \
src/pybind/mgr/dashboard/awsauth.py
# suppress deprecation warnings
sed -i '/#ifndef CEPH_CONFIG_H/i#define BOOST_ALLOW_DEPRECATED_HEADERS' \
src/common/config.h
sed -i '/#ifndef CEPH_TYPES_H/i#define BOOST_ALLOW_DEPRECATED_HEADERS' \
src/include/types.h
# fix boost stuff for system-boost
find . -name '*.cmake' -or -name 'CMakeLists.txt' -print0 | xargs --null \
sed -r \
-e 's|Boost::|boost_|g' \
-e 's|Boost_|boost_|g' \
-e 's|[Bb]oost_boost|boost_system|g' -i || exit 1
# remove bundled zstd and replace with newer release
rm -rf src/zstd
ln -sf "${srcdir}/zstd-${_zstdver}" src/zstd
@ -100,26 +127,26 @@ prepare() {
# remove tests that require root privileges
rm src/test/cli/ceph-authtool/cap*.t
# disable certain pylint test cases (we don't are about them for packaging)
sed -i 's/,py3-lint//' src/pybind/mgr/dashboard/run-tox.sh
# this test will try to perform btrfs operations when a btrfs mount
# is active on the build host, which will fail
# if mount | grep 'type btrfs' &>/dev/null; then
# sed -i '/run-tox-ceph-disk/d' src/test/CMakeLists.txt
# fi
# disable/remove broken tests
sed -i '/add_ceph_test(smoke.sh/d' src/test/CMakeLists.txt
sed -i '/add_ceph_test(safe-to-destroy.sh/d' src/test/osd/CMakeLists.txt
}
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
mkdir -p build
cd build
# workaround for boost 1.74 -- similar fix exists upstream but I could
# not get it to work: https://github.com/ceph/ceph/commit/3d708219092d
CPPFLAGS+=' -DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT'
export CFLAGS+=" ${CPPFLAGS}"
export CXXFLAGS+=" ${CPPFLAGS}"
export PYTHON_INCLUDE_DIR="$(python -c "from sysconfig import get_path; print(get_path('include'))")"
export CMAKE_BUILD_TYPE='RelWithDebInfo'
export CMAKE_WARN_UNUSED_CLI=no
cmake \
-B build \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_SBINDIR=/usr/bin \
@ -128,10 +155,9 @@ build() {
-DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=/usr/lib/systemd/system \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInf \
-DENABLE_GIT_VERSION=ON \
-DWITH_PYTHON2=OFF \
-DWITH_PYTHON3=ON \
-DWITH_PYTHON3=3.9 \
-DMGR_PYTHON_VERSION=3 \
-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR:?}" \
-DWITH_BABELTRACE=OFF \
@ -156,22 +182,23 @@ build() {
-DWITH_RADOSGW_BEAST_OPENSSL=ON \
-DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
-DWITH_SYSTEMD=ON \
-DWITH_SYSTEM_BOOST=OFF \
-DWITH_SYSTEM_BOOST=ON \
-DWITH_BOOST_CONTEXT=ON \
-DWITH_SYSTEM_GTEST=OFF \
-DWITH_SYSTEM_NPM=ON \
-DWITH_SYSTEM_NPM=OFF \
-DENABLE_SHARED=ON \
-DWITH_TESTS=ON \
..
-Wno-dev
VERBOSE=1 make all
VERBOSE=1 make -C build all
}
check() {
cd "${srcdir}/${pkgbase}-${pkgver}/build"
cd "${srcdir}/${pkgbase}-${pkgver}"
export CTEST_PARALLEL_LEVEL="8"
VERBOSE=1 make check
export CTEST_PARALLEL_LEVEL=8
export CTEST_OUTPUT_ON_FAILURE=1
VERBOSE=1 make -C build check
# sometimes processes are not properly terminated...
for process in ceph-mon ceph-mgr ceph-osd; do
@ -180,13 +207,13 @@ check() {
}
package_ceph-libs() {
depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'libutil-linux' 'lz4' 'nss'
depends=('boost-libs' 'curl' 'fmt' 'glibc' 'keyutils' 'libutil-linux' 'bzip2' 'lz4' 'nss'
'oath-toolkit' 'python' 'snappy' 'systemd-libs')
cd "${srcdir}/${pkgbase}-${pkgver}/build"
cd "${srcdir}/${pkgbase}-${pkgver}"
# main install
VERBOSE=1 make DESTDIR="${pkgdir}" install
VERBOSE=1 make DESTDIR="${pkgdir}" -C build install
# remove stuff that goes into the ceph package
rm -rf "${pkgdir}"/usr/lib/{ceph/mgr,systemd,sysusers.d,tmpfiles.d}
@ -199,15 +226,17 @@ package_ceph-libs() {
package_ceph() {
depends=("ceph-libs=${pkgver}-${pkgrel}"
'boost-libs' 'curl' 'fuse2' 'glibc' 'gperftools' 'java-runtime'
'keyutils' 'leveldb' 'libaio' 'libutil-linux' 'lsb-release' 'ncurses'
'boost-libs' 'curl' 'fuse2' 'fuse3' 'glibc' 'gperftools' 'java-runtime'
'keyutils' 'leveldb' 'libaio' 'libutil-linux' 'librdkafka'
'lsb-release' 'ncurses'
'nss' 'oath-toolkit' 'python' 'python-bcrypt' 'python-setuptools'
'python-cmd2' 'snappy' 'systemd-libs' 'xfsprogs')
'python-prettytable' 'python-cmd2' 'python-dateutil' 'snappy' 'sudo' 'systemd-libs'
'python-flask' 'python-pecan' 'python-pyopenssl' 'python-requests' 'python-werkzeug' 'xfsprogs')
cd "${srcdir}/${pkgbase}-${pkgver}/build"
cd "${srcdir}/${pkgbase}-${pkgver}"
# main install
VERBOSE=1 make DESTDIR="${pkgdir}" install
VERBOSE=1 make DESTDIR="${pkgdir}" -C build install
# fix sbin dir (cmake opt seems to have no effect)
mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
@ -264,18 +293,18 @@ package_ceph-mgr() {
depends=("ceph=${pkgver}-${pkgrel}" "ceph-libs=${pkgver}-${pkgrel}"
'bash' 'boost-libs' 'coffeescript' 'curl' 'gperftools' 'nodejs' 'nss'
'python' 'python-cherrypy' 'python-flask-restful' 'python-pecan'
'python-pyjwt' 'python-routes' 'python-requests' 'python-pyopenssl'
'python-prettytable' 'python-yaml')
'python-pyjwt' 'python-routes' 'python-jsonpatch' 'python-more-itertools' 'python-numpy'
'python-yaml' 'python-pyaml' 'python-scipy' 'python-six')
optdepends=('python-influxdb: influx module'
'python-kubernetes: rook module'
'python-prometheus_client: prometheus module'
'python-remoto: ssh module')
conflicts=('ceph<14.2.1-1')
cd "${srcdir}/${pkgbase}-${pkgver}/build"
cd "${srcdir}/${pkgbase}-${pkgver}"
# main install
VERBOSE=1 make DESTDIR="${pkgdir}" install
VERBOSE=1 make DESTDIR="${pkgdir}" -C build install
# fix sbin dir (cmake opt seems to have no effect)
mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"

26
ceph/ceph-12.2.4-boost-build-none-options.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/src/boost/tools/build/src/tools/features/debug-feature.jam b/src/boost/tools/build/src/tools/features/debug-feature.jam
index 04958f9a..38b6acf1 100644
--- a/src/boost/tools/build/src/tools/features/debug-feature.jam
+++ b/src/boost/tools/build/src/tools/features/debug-feature.jam
@@ -8,7 +8,7 @@
import feature ;
feature.feature debug-symbols
- : on off
+ : on off none
: propagated ;
feature.feature profiling
diff --git a/src/boost/tools/build/src/tools/features/optimization-feature.jam b/src/boost/tools/build/src/tools/features/optimization-feature.jam
index 761f76f1..fb2a5dec 100644
--- a/src/boost/tools/build/src/tools/features/optimization-feature.jam
+++ b/src/boost/tools/build/src/tools/features/optimization-feature.jam
@@ -8,7 +8,7 @@
import feature ;
feature.feature optimization
- : off speed space
+ : off none speed space
: propagated ;
feature.feature inlining

26
ceph/ceph-13.2.0-cflags.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
index d6572115a4..cc0bdddc9f 100644
--- a/cmake/modules/BuildBoost.cmake
+++ b/cmake/modules/BuildBoost.cmake
@@ -62,7 +62,7 @@ function(do_build_boost version)
else()
list(APPEND boost_features "address-model=32")
endif()
- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
+ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX
list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
list(FIND Boost_BUILD_COMPONENTS "python" with_python)
diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
index 5a80aa539c..8d6ff5c8f0 100644
--- a/src/compressor/zstd/CMakeLists.txt
+++ b/src/compressor/zstd/CMakeLists.txt
@@ -1,7 +1,7 @@
# zstd
# libzstd - build it statically
-set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3")
+set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable $ENV{CFLAGS} -O3")
include(ExternalProject)
ExternalProject_Add(zstd_ext

15
ceph/ceph-13.2.2-dont-install-sysvinit-script.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 874eabfaa1..e337f4cf8e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -601,10 +601,6 @@ install(PROGRAMS
${CMAKE_SOURCE_DIR}/src/ceph-run
${CMAKE_SOURCE_DIR}/src/ceph-clsinfo
DESTINATION bin)
-install(PROGRAMS
- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/init-ceph
- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d
- RENAME ceph)
install(FILES
${CMAKE_SOURCE_DIR}/share/id_rsa_drop.ceph.com

13
ceph/ceph-14.2.0-cflags.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
index 5697dff85f..7fdcfe4112 100644
--- a/cmake/modules/Distutils.cmake
+++ b/cmake/modules/Distutils.cmake
@@ -61,7 +61,7 @@ function(distutils_add_cython_module name src)
CC="${PY_CC}"
CXX="${PY_CXX}"
LDSHARED="${PY_LDSHARED}"
- OPT=\"-DNDEBUG -g -fwrapv -O2 -w\"
+ OPT=\"-DNDEBUG -g -fwrapv -w\"
LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}

17
ceph/ceph-14.2.0-cython-0.29.patch Normal file
View File

@ -0,0 +1,17 @@
--- ceph-13.2.1/cmake/modules/Distutils.cmake.old 2018-07-26 17:39:56.000000000 -0000
+++ ceph-13.2.1/cmake/modules/Distutils.cmake 2018-12-24 05:43:51.566174070 -0000
@@ -58,8 +62,13 @@
function(distutils_install_cython_module name)
get_property(compiler_launcher GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
get_property(link_launcher GLOBAL PROPERTY RULE_LAUNCH_LINK)
- set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER}")
+ string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS})
+ list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w)
+ list(APPEND cflags -D'void0=dead_function\(void\)')
+ list(APPEND cflags -D'__Pyx_check_single_interpreter\(ARG\)=ARG \#\# 0')
+ string(REPLACE ";" " " cflags "${cflags}")
+ set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER} ${cflags}")
set(PY_LDSHARED "${link_launcher} ${CMAKE_C_COMPILER} -shared")
install(CODE "
set(ENV{CC} \"${PY_CC}\")
set(ENV{LDSHARED} \"${PY_LDSHARED}\")

11
ceph/ceph-14.2.0-link-crc32-statically.patch Normal file
View File

@ -0,0 +1,11 @@
--- ceph-14.2.0.orig/src/common/CMakeLists.txt 2019-03-18 04:08:29.000000000 -0600
+++ ceph-14.2.0/src/common/CMakeLists.txt 2019-03-21 18:42:32.903182824 -0600
@@ -165,7 +165,7 @@
crc32c_aarch64.c)
endif(HAVE_INTEL)
-add_library(crc32 ${crc32_srcs})
+add_library(crc32 STATIC ${crc32_srcs})
if(HAVE_ARMV8_CRC)
set_target_properties(crc32 PROPERTIES
COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")

15
ceph/ceph-15.2.0-rocksdb-cmake.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake
index de9748878b..4b86b36d35 100644
--- a/cmake/modules/BuildRocksDB.cmake
+++ b/cmake/modules/BuildRocksDB.cmake
@@ -6,10 +6,6 @@ function(build_rocksdb)
# CMAKE_PREFIX_PATH, for which reason we'll have to use some other separator.
string(REPLACE ";" "!" CMAKE_PREFIX_PATH_ALT_SEP "${CMAKE_PREFIX_PATH}")
list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP})
- if(CMAKE_TOOLCHAIN_FILE)
- list(APPEND rocksdb_CMAKE_ARGS
- -DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE)
- endif()
if(ALLOCATOR STREQUAL "jemalloc")
list(APPEND rocksdb_CMAKE_ARGS -DWITH_JEMALLOC=ON)

66
ceph/ceph-15.2.4-system-uring.patch Normal file
View File

@ -0,0 +1,66 @@
diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index 760244b9b4..7f83923671 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -134,27 +134,6 @@ if(WITH_EVENTTRACE)
endif()
if(WITH_LIBURING)
- include(ExternalProject)
- if("${CMAKE_GENERATOR}" MATCHES "Make")
- set(make_cmd "$(MAKE)")
- else()
- set(make_cmd "make")
- endif()
- ExternalProject_Add(liburing_ext
- DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/src/
- GIT_REPOSITORY http://git.kernel.dk/liburing
- GIT_TAG "4e360f71131918c36774f51688e5c65dea8d43f2"
- SOURCE_DIR ${CMAKE_BINARY_DIR}/src/liburing
- CONFIGURE_COMMAND <SOURCE_DIR>/configure
- BUILD_COMMAND env CC=${CMAKE_C_COMPILER} ${make_cmd} -C src -s
- BUILD_IN_SOURCE 1
- INSTALL_COMMAND "")
- unset(make_cmd)
- add_library(liburing STATIC IMPORTED GLOBAL)
- add_dependencies(liburing liburing_ext)
- set_target_properties(liburing PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/src/liburing/src/liburing.a")
- target_link_libraries(os liburing)
- target_include_directories(os SYSTEM PRIVATE "${CMAKE_BINARY_DIR}/src/liburing/src/include")
+ pkg_check_modules(LIBURING REQUIRED IMPORTED_TARGET liburing)
+ target_link_libraries(os uring)
endif(WITH_LIBURING)
diff --git a/src/os/bluestore/io_uring.cc b/src/os/bluestore/io_uring.cc
index 54fa0f9535..4ba83cf172 100644
--- a/src/os/bluestore/io_uring.cc
+++ b/src/os/bluestore/io_uring.cc
@@ -7,6 +7,8 @@
#include "liburing.h"
#include <sys/epoll.h>
+#include <unistd.h>
+#include <sys/syscall.h>
/* Options */
@@ -134,8 +136,7 @@ int ioring_queue_t::init(std::vector<int> &fds)
if (ret < 0)
return ret;
- ret = io_uring_register(d->io_uring.ring_fd, IORING_REGISTER_FILES,
- &fds[0], fds.size());
+ ret = io_uring_register_files(&d->io_uring, &fds[0], fds.size());
if (ret < 0) {
ret = -errno;
goto close_ring_fd;
@@ -214,7 +215,7 @@ bool ioring_queue_t::supported()
struct io_uring_params p;
memset(&p, 0, sizeof(p));
- int fd = io_uring_setup(16, &p);
+ int fd = syscall(SYS_io_uring_setup, 16, &p);
if (fd < 0)
return false;

12
ceph/ceph-15.2.5-missing-includes.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/tools/rbd/action/Bench.cc b/src/tools/rbd/action/Bench.cc
index aa6edbc18b..90c551c179 100644
--- a/src/tools/rbd/action/Bench.cc
+++ b/src/tools/rbd/action/Bench.cc
@@ -9,6 +9,7 @@
#include "common/ceph_mutex.h"
#include "include/types.h"
#include "global/signal_handler.h"
+#include <atomic>
#include <iostream>
#include <boost/accumulators/accumulators.hpp>
#include <boost/accumulators/statistics/stats.hpp>

260
ceph/fix-or-disable-broken-tests.patch
View File

@ -1,260 +0,0 @@
--- a/src/test/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
+++ b/src/test/CMakeLists.txt 2018-06-04 13:35:28.440465053 +0200
@@ -572,7 +572,6 @@ add_ceph_test(test_objectstore_memstore.
#add_ceph_test(test_pidfile.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_pidfile.sh)
add_ceph_test(test_subman.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_subman.sh)
-add_ceph_test(smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/smoke.sh)
add_ceph_test(unittest_bufferlist.sh ${CMAKE_SOURCE_DIR}/src/unittest_bufferlist.sh)
add_test(NAME run-tox-ceph-disk COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-disk/run-tox.sh)
--- a/src/test/common/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
+++ b/src/test/common/CMakeLists.txt 2018-06-04 13:36:33.340014839 +0200
@@ -41,13 +41,6 @@ add_executable(unittest_prioritized_queu
)
add_ceph_unittest(unittest_prioritized_queue)
-# unittest_mclock_priority_queue
-add_executable(unittest_mclock_priority_queue
- test_mclock_priority_queue.cc
- )
-add_ceph_unittest(unittest_mclock_priority_queue)
-target_link_libraries(unittest_mclock_priority_queue ceph-common dmclock)
-
# unittest_str_map
add_executable(unittest_str_map
test_str_map.cc
--- a/src/test/encoding/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
+++ b/src/test/encoding/CMakeLists.txt 2018-06-04 13:37:22.693006351 +0200
@@ -1,4 +1,3 @@
# scripts
-add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
--- a/src/test/run-cli-tests 2018-05-29 14:04:02.000000000 +0200
+++ b/src/test/run-cli-tests 2018-06-04 13:38:12.529328276 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
-if ! command -v virtualenv >/dev/null; then
+if ! command -v virtualenv2 >/dev/null; then
echo "$0: virtualenv not installed, skipping python-using tests." 1>&2
exit 1
fi
@@ -30,7 +30,7 @@ if [ ! -e "$CRAM_BIN" ]; then
# patched cram to support that. See upstream ticket at
# https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
# -- tv@inktank.com
- virtualenv "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
+ virtualenv2 "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
fi
SRCDIR_ABS="$(readlink -f "$SRCDIR")"
--- a/src/test/pybind/test_ceph_argparse.py 2017-09-26 18:27:07.000000000 +0200
+++ b/src/test/pybind/test_ceph_argparse.py 2017-10-08 16:50:49.060831801 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env nosetests
+#!/usr/bin/env nosetests2
# -*- mode:python; tab-width:4; indent-tabs-mode:t; coding:utf-8 -*-
# vim: ts=4 sw=4 smarttab expandtab fileencoding=utf-8
#
--- a/src/test/pybind/test_ceph_daemon.py 2017-09-26 18:27:07.000000000 +0200
+++ b/src/test/pybind/test_ceph_daemon.py 2017-10-08 16:50:58.341131927 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env nosetests
+#!/usr/bin/env nosetests2
# -*- mode:python; tab-width:4; indent-tabs-mode:t -*-
# vim: ts=4 sw=4 smarttab expandtab
#
--- a/qa/standalone/ceph-helpers.sh 2018-05-29 14:04:02.000000000 +0200
+++ b/qa/standalone/ceph-helpers.sh 2018-06-04 13:39:31.305450795 +0200
@@ -147,7 +147,7 @@ function teardown() {
kill_daemons $dir KILL
if [ `uname` != FreeBSD ] \
&& [ $(stat -f -c '%T' .) == "btrfs" ]; then
- __teardown_btrfs $dir
+ true
fi
local cores="no"
local pattern="$(sysctl -n $KERNCORE)"
@@ -183,12 +183,7 @@ function teardown() {
}
function __teardown_btrfs() {
- local btrfs_base_dir=$1
- local btrfs_root=$(df -P . | tail -1 | awk '{print $NF}')
- local btrfs_dirs=$(cd $btrfs_base_dir; sudo btrfs subvolume list -t . | awk '/^[0-9]/ {print $4}' | grep "$btrfs_base_dir/$btrfs_dir")
- for subvolume in $btrfs_dirs; do
- sudo btrfs subvolume delete $btrfs_root/$subvolume
- done
+ true
}
function test_teardown() {
--- a/src/ceph-disk/run-tox.sh 2018-05-29 14:04:02.000000000 +0200
+++ b/src/ceph-disk/run-tox.sh 2018-06-04 13:40:15.601811858 +0200
@@ -30,4 +30,4 @@ if [ -z $CEPH_BUILD_DIR ]; then
fi
source ${CEPH_DISK_VIRTUALENV}/bin/activate
-tox -c ${TOX_PATH}
+tox2 -c ${TOX_PATH}
--- a/qa/workunits/rbd/run_devstack_tempest.sh 2017-09-26 18:27:07.000000000 +0200
+++ b/qa/workunits/rbd/run_devstack_tempest.sh 2017-10-10 18:53:33.564468674 +0200
@@ -127,4 +127,4 @@
chmod -R o+rx ${STACK_OPT_PATH}/devstack/files
cd ${STACK_OPT_PATH}/tempest
-sudo -H -u ${TEMPEST_USER} tox -eall-plugin -- '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))' --concurrency=3
+sudo -H -u ${TEMPEST_USER} tox2 -eall-plugin -- '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))' --concurrency=3
--- a/src/test/filestore/TestFileStore.cc 2017-09-26 18:27:07.000000000 +0200
+++ b/src/test/filestore/TestFileStore.cc 2017-10-10 20:31:36.325983555 +0200
@@ -36,13 +36,6 @@
ASSERT_EQ(pm["filestore_backend"], "generic");
}
#if defined(__linux__)
- {
- map<string,string> pm;
- FileStore fs(g_ceph_context, "a", "b");
- TestFileStore::create_backend(fs, BTRFS_SUPER_MAGIC);
- fs.collect_metadata(&pm);
- ASSERT_EQ(pm["filestore_backend"], "btrfs");
- }
# ifdef HAVE_LIBXFS
{
map<string,string> pm;
--- a/src/test/cli/osdmaptool/ceph.conf.withracks 2017-09-26 18:27:07.000000000 +0200
+++ b/src/test/cli/osdmaptool/ceph.conf.withracks 2017-10-10 21:30:49.230389707 +0200
@@ -42,8 +42,8 @@
keyring = /mnt/osd.$id/keyring
osd data = /mnt/osd.$id
osd journal = /dev/disk/by-label/osd.$id.journal
- osd mkfs type = btrfs
- osd mount options btrfs = rw,noatime
+ osd mkfs type = xfs
+ osd mount options xfs = rw,noatime
devs = /dev/disk/by-label/osd.$id.data
; temp sage
debug osd = 20
--- a/src/spdk/test/iscsi_tgt/filesystem/filesystem.sh 2017-04-13 06:05:24.000000000 +0200
+++ b/src/spdk/test/iscsi_tgt/filesystem/filesystem.sh 2017-10-10 21:33:09.084930640 +0200
@@ -55,7 +55,7 @@
parted -s /dev/$dev mkpart primary '0%' '100%'
sleep 1
-for fstype in "ext4" "btrfs" "xfs"; do
+for fstype in "ext4" "xfs"; do
if [ "$fstype" == "ext4" ]; then
mkfs.${fstype} -F /dev/${dev}1
--- a/src/spdk/test/nvmf/filesystem/filesystem.sh 2017-04-13 06:05:24.000000000 +0200
+++ b/src/spdk/test/nvmf/filesystem/filesystem.sh 2017-10-10 21:33:26.258820759 +0200
@@ -49,7 +49,7 @@
timing_exit parted
sleep 1
- for fstype in "ext4" "btrfs" "xfs"; do
+ for fstype in "ext4" "xfs"; do
timing_enter $fstype
if [ $fstype = ext4 ]; then
force=-F
--- a/src/ceph.conf.twoosds 2017-09-26 18:27:07.000000000 +0200
+++ b/src/ceph.conf.twoosds 2017-10-10 21:34:13.160340506 +0200
@@ -72,8 +72,8 @@
; osd journal = /mnt/osd$id/journal
; osd journal size = 1000
osd journal = "/dev/disk/by-path/pci-0000:05:02.0-scsi-6:0:0:0"
- osd mkfs type = btrfs
- osd mount options btrfs = "flushoncommit,usertrans"
+ osd mkfs type = xfs
+ osd mount options xfs = "flushoncommit,usertrans"
; filestore max sync interval = 1
devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0"
--- a/src/ceph-disk/tests/ceph-disk.sh 2017-09-26 18:27:07.000000000 +0200
+++ b/src/ceph-disk/tests/ceph-disk.sh 2017-10-10 21:35:26.386044372 +0200
@@ -74,8 +74,7 @@
kill_daemons $dir
if [ `uname` != FreeBSD ] && \
[ $(stat -f -c '%T' .) == "btrfs" ]; then
- rm -fr $dir/*/*db
- __teardown_btrfs $dir
+ true
fi
grep " $(pwd)/$dir/" < ${PROCDIR}/proc/mounts | while read mounted rest ; do
umount $mounted
--- a/qa/run_xfstests.sh 2017-09-26 18:27:07.000000000 +0200
+++ b/qa/run_xfstests.sh 2017-10-10 22:18:49.663141392 +0200
@@ -81,7 +81,7 @@
arg_count 1 $#
case "$1" in
- xfs|ext4|btrfs) return 0 ;;
+ xfs|ext4) return 0 ;;
*) return 1 ;;
esac
}
@@ -120,7 +120,7 @@
echo " -c or --count" >&2
echo " iteration count (1 or more)" >&2
echo " -f or --fs-type" >&2
- echo " one of: xfs, ext4, btrfs" >&2
+ echo " one of: xfs, ext4" >&2
echo " (default fs-type: xfs)" >&2
echo " -r or --randomize" >&2
echo " randomize test order" >&2
@@ -132,7 +132,7 @@
echo " name of file with list of tests to skip" >&2
echo " tests:" >&2
echo " list of test numbers, e.g.:" >&2
- echo " generic/001 xfs/008 shared/032 btrfs/009" >&2
+ echo " generic/001 xfs/008 shared/032" >&2
echo " or possibly an xfstests test group, e.g.:" >&2
echo " -g quick" >&2
echo " (default tests: -g auto)" >&2
@@ -235,7 +235,6 @@
case "${FSTYP}" in
xfs) options="-f" ;;
ext4) options="-F" ;;
- btrfs) options="-f" ;;
esac
"mkfs.${FSTYP}" ${options} "${dev}" ||
--- a/qa/run_xfstests-obsolete.sh 2017-09-26 18:27:07.000000000 +0200
+++ b/qa/run_xfstests-obsolete.sh 2017-10-10 22:19:27.027675395 +0200
@@ -125,7 +125,7 @@
arg_count 1 $#
case "$1" in
- xfs|ext4|btrfs) return 0 ;;
+ xfs|ext4) return 0 ;;
*) return 1 ;;
esac
}
@@ -157,7 +157,7 @@
echo " -c or --count" >&2
echo " iteration count (1 or more)" >&2
echo " -f or --fs-type" >&2
- echo " one of: xfs, ext4, btrfs" >&2
+ echo " one of: xfs, ext4" >&2
echo " (default fs-type: xfs)" >&2
echo " -s or --scratch-dev (REQUIRED)" >&2
echo " name of device used for scratch filesystem" >&2
@@ -262,7 +262,7 @@
# Filesystem-specific mkfs options--set if not supplied
export XFS_MKFS_OPTIONS="${XFS_MKFS_OPTIONS:--f -l su=65536}"
export EXT4_MKFS_OPTIONS="${EXT4_MKFS_OPTIONS:--F}"
-export BTRFS_MKFS_OPTION # No defaults
+unset BTRFS_MKFS_OPTION # No defaults
XFSTESTS_DIR="/var/lib/xfstests" # Where the tests live
@@ -348,7 +348,6 @@
case "${FSTYP}" in
xfs) options="${XFS_MKFS_OPTIONS}" ;;
ext4) options="${EXT4_MKFS_OPTIONS}" ;;
- btrfs) options="${BTRFS_MKFS_OPTIONS}" ;;
esac
"mkfs.${FSTYP}" ${options} "${dev}" ||

52
ceph/fix-python2-paths.patch
View File

@ -1,52 +0,0 @@
--- a/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
+++ b/CMakeLists.txt 2018-06-04 13:41:55.684455580 +0200
@@ -49,7 +49,7 @@ endif(WITH_CCACHE)
option(WITH_MANPAGE "Build man pages." ON)
if(WITH_MANPAGE)
find_program(SPHINX_BUILD
- sphinx-build)
+ sphinx-build2)
if(NOT SPHINX_BUILD)
message(FATAL_ERROR "Can't find sphinx-build.")
endif(NOT SPHINX_BUILD)
--- a/src/tools/setup-virtualenv.sh 2018-05-29 14:04:02.000000000 +0200
+++ b/src/tools/setup-virtualenv.sh 2018-06-04 13:43:24.767175961 +0200
@@ -58,10 +58,10 @@ if [ -z "$DIR" ] ; then
fi
rm -fr $DIR
mkdir -p $DIR
-virtualenv --python $PYTHON_BINARY $DIR
+virtualenv2 --python $PYTHON_BINARY $DIR
. $DIR/bin/activate
-if pip --help | grep -q disable-pip-version-check; then
+if pip2 --help | grep -q disable-pip-version-check; then
DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
else
DISABLE_PIP_VERSION_CHECK=
@@ -69,12 +69,12 @@ fi
# older versions of pip will not install wrap_console scripts
# when using wheel packages
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
# workaround of https://github.com/pypa/setuptools/issues/1042
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
-if pip --help | grep -q disable-pip-version-check; then
+if pip2 --help | grep -q disable-pip-version-check; then
DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
else
DISABLE_PIP_VERSION_CHECK=
@@ -84,7 +84,7 @@ if test -d wheelhouse ; then
export NO_INDEX=--no-index
fi
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
if test -f requirements.txt ; then
- pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
+ pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
fi

11
ceph/fix-sphinx-binary-name.patch
View File

@ -1,11 +0,0 @@
--- a/CMakeLists.txt 2017-09-26 18:27:07.000000000 +0200
+++ b/CMakeLists.txt 2017-10-06 14:10:11.032378659 +0200
@@ -63,7 +63,7 @@
option(WITH_MANPAGE "Build man pages." ON)
if(WITH_MANPAGE)
find_program(SPHINX_BUILD
- sphinx-build)
+ sphinx-build2)
if(NOT SPHINX_BUILD)
message(FATAL_ERROR "Can't find sphinx-build.")
endif(NOT SPHINX_BUILD)

63
ceph/glibc2.32-strsignal-compat-backported.patch Normal file
View File

@ -0,0 +1,63 @@
From b9b6faf66ae67648626470cb4fc3f0850ac4d842 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Tue, 1 Sep 2020 13:49:21 +0200
Subject: [PATCH] cmake: detect and use sigdescr_np() if available
sys_siglist is deprecated with glibc 2.32. A new thread-safe and
async-signal safe sigdescr_np() function is provided, so use it if
available.
Fixes: https://tracker.ceph.com/issues/47187
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
cmake/modules/CephChecks.cmake | 1 +
src/global/signal_handler.h | 8 +++++---
src/include/config-h.in.cmake | 3 +++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cmake/modules/CephChecks.cmake b/cmake/modules/CephChecks.cmake
index 23687283a7c6..ca86dcbc73de 100644
--- a/cmake/modules/CephChecks.cmake
+++ b/cmake/modules/CephChecks.cmake
@@ -24,6 +24,7 @@ check_function_exists(strerror_r HAVE_Strerror_R)
check_function_exists(name_to_handle_at HAVE_NAME_TO_HANDLE_AT)
check_function_exists(pipe2 HAVE_PIPE2)
check_function_exists(accept4 HAVE_ACCEPT4)
+check_function_exists(sigdescr_np HAVE_SIGDESCR_NP)
include(CMakePushCheckState)
cmake_push_check_state(RESET)
diff --git a/src/global/signal_handler.h b/src/global/signal_handler.h
index 476724201aa9..c101b2e28733 100644
--- a/src/global/signal_handler.h
+++ b/src/global/signal_handler.h
@@ -20,10 +20,12 @@
typedef void (*signal_handler_t)(int);
-#ifndef HAVE_REENTRANT_STRSIGNAL
-# define sig_str(signum) sys_siglist[signum]
-#else
+#ifdef HAVE_SIGDESCR_NP
+# define sig_str(signum) sigdescr_np(signum)
+#elif HAVE_REENTRANT_STRSIGNAL
# define sig_str(signum) strsignal(signum)
+#else
+# define sig_str(signum) sys_siglist[signum]
#endif
void install_sighandler(int signum, signal_handler_t handler, int flags);
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 1ea3703f620c..59bd4273511a 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -220,6 +220,9 @@
/* Define to 1 if you have sched.h. */
#cmakedefine HAVE_SCHED 1
+/* Define to 1 if you have sigdescr_np. */
+#cmakedefine HAVE_SIGDESCR_NP 1
+
/* Support SSE (Streaming SIMD Extensions) instructions */
#cmakedefine HAVE_SSE

671
ceph/mgr-dashboard-update-pylint-to-2.6.0.patch Normal file
View File

@ -0,0 +1,671 @@
From e4f179fa960ed18e8f45bc87d26552d720bc819b Mon Sep 17 00:00:00 2001
From: Volker Theile <vtheile@suse.com>
Date: Fri, 25 Sep 2020 13:17:19 +0200
Subject: [PATCH] mgr/dashboard: update pylint to 2.6.0
* Update pylint to 2.6.0.
* Fix pylint issues.
Fixes: https://tracker.ceph.com/issues/47647
(cherry picked from commit 298c91958a41674a928d53f010b20f174f16d68f)
---
src/pybind/mgr/dashboard/.pylintrc | 8 ++++++--
.../mgr/dashboard/controllers/nfsganesha.py | 2 +-
src/pybind/mgr/dashboard/controllers/osd.py | 2 +-
src/pybind/mgr/dashboard/plugins/__init__.py | 2 +-
.../mgr/dashboard/requirements-lint.txt | 2 +-
src/pybind/mgr/dashboard/services/auth.py | 1 -
.../mgr/dashboard/services/ceph_service.py | 2 +-
src/pybind/mgr/dashboard/services/cephx.py | 2 +-
src/pybind/mgr/dashboard/services/ganesha.py | 20 +++++++++----------
.../mgr/dashboard/services/iscsi_client.py | 2 +-
.../mgr/dashboard/services/iscsi_config.py | 2 +-
src/pybind/mgr/dashboard/services/progress.py | 2 +-
.../mgr/dashboard/services/rgw_client.py | 3 ++-
src/pybind/mgr/dashboard/tests/__init__.py | 2 +-
src/pybind/mgr/dashboard/tests/helper.py | 2 +-
.../dashboard/tests/test_access_control.py | 2 +-
.../mgr/dashboard/tests/test_api_auditing.py | 2 +-
src/pybind/mgr/dashboard/tests/test_cephfs.py | 2 +-
.../mgr/dashboard/tests/test_controllers.py | 2 +-
src/pybind/mgr/dashboard/tests/test_docs.py | 2 +-
.../tests/test_erasure_code_profile.py | 2 +-
.../mgr/dashboard/tests/test_exceptions.py | 2 +-
.../dashboard/tests/test_feature_toggles.py | 2 +-
.../mgr/dashboard/tests/test_ganesha.py | 2 +-
.../mgr/dashboard/tests/test_grafana.py | 2 +-
src/pybind/mgr/dashboard/tests/test_home.py | 2 +-
src/pybind/mgr/dashboard/tests/test_host.py | 2 +-
src/pybind/mgr/dashboard/tests/test_iscsi.py | 3 ++-
.../mgr/dashboard/tests/test_orchestrator.py | 2 +-
src/pybind/mgr/dashboard/tests/test_osd.py | 4 ++--
.../mgr/dashboard/tests/test_plugin_debug.py | 2 +-
src/pybind/mgr/dashboard/tests/test_pool.py | 2 +-
.../mgr/dashboard/tests/test_prometheus.py | 2 +-
.../mgr/dashboard/tests/test_rbd_mirroring.py | 2 +-
.../mgr/dashboard/tests/test_rest_tasks.py | 2 +-
src/pybind/mgr/dashboard/tests/test_rgw.py | 2 +-
.../mgr/dashboard/tests/test_rgw_client.py | 2 +-
.../mgr/dashboard/tests/test_settings.py | 2 +-
src/pybind/mgr/dashboard/tests/test_sso.py | 3 ++-
src/pybind/mgr/dashboard/tests/test_tools.py | 2 +-
src/pybind/mgr/dashboard/tools.py | 2 +-
41 files changed, 58 insertions(+), 52 deletions(-)
diff --git a/src/pybind/mgr/dashboard/.pylintrc b/src/pybind/mgr/dashboard/.pylintrc
index 404a16a2e6..c4bf033cda 100644
--- a/src/pybind/mgr/dashboard/.pylintrc
+++ b/src/pybind/mgr/dashboard/.pylintrc
@@ -15,7 +15,7 @@ ignore-patterns=
# Python code to execute, usually for sys.path manipulation such as
# pygtk.require().
-#init-hook=
+init-hook='import sys; sys.path.append("./")'
# Use multiple processes to speed up Pylint.
jobs=1
@@ -118,7 +118,11 @@ disable=import-star-module-level,
too-many-arguments,
too-many-locals,
too-many-statements,
- useless-object-inheritance
+ useless-object-inheritance,
+ relative-beyond-top-level,
+ raise-missing-from,
+ super-with-arguments,
+ import-outside-toplevel
# Enable the message, report, category or checker with the given id(s). You can
diff --git a/src/pybind/mgr/dashboard/controllers/nfsganesha.py b/src/pybind/mgr/dashboard/controllers/nfsganesha.py
index 1219f78b95..510b37a712 100644
--- a/src/pybind/mgr/dashboard/controllers/nfsganesha.py
+++ b/src/pybind/mgr/dashboard/controllers/nfsganesha.py
@@ -272,7 +272,7 @@ class NFSGaneshaService(RESTController):
class NFSGaneshaUi(BaseController):
@Endpoint('GET', '/cephx/clients')
def cephx_clients(self):
- return [client for client in CephX.list_clients()]
+ return list(CephX.list_clients())
@Endpoint('GET', '/fsals')
def fsals(self):
diff --git a/src/pybind/mgr/dashboard/controllers/osd.py b/src/pybind/mgr/dashboard/controllers/osd.py
index 2731ad0ffc..f95951cba2 100644
--- a/src/pybind/mgr/dashboard/controllers/osd.py
+++ b/src/pybind/mgr/dashboard/controllers/osd.py
@@ -272,7 +272,7 @@ class Osd(RESTController):
@CreatePermission
@osd_task('create', {'tracking_id': '{tracking_id}'})
- def create(self, method, data, tracking_id): # pylint: disable=W0622
+ def create(self, method, data, tracking_id): # pylint: disable=unused-argument
if method == 'bare':
return self._create_bare(data)
if method == 'drive_groups':
diff --git a/src/pybind/mgr/dashboard/plugins/__init__.py b/src/pybind/mgr/dashboard/plugins/__init__.py
index 8973654770..3e3aca4001 100644
--- a/src/pybind/mgr/dashboard/plugins/__init__.py
+++ b/src/pybind/mgr/dashboard/plugins/__init__.py
@@ -71,4 +71,4 @@ class DashboardPluginManager(object):
PLUGIN_MANAGER = DashboardPluginManager("ceph-mgr.dashboard")
# Load all interfaces and their hooks
-from . import interfaces # noqa: F401 pylint: disable=wrong-import-position,cyclic-import
+from . import interfaces # noqa pylint: disable=C0413,W0406
diff --git a/src/pybind/mgr/dashboard/requirements-lint.txt b/src/pybind/mgr/dashboard/requirements-lint.txt
index 8f68ad3856..f01fa54e6e 100644
--- a/src/pybind/mgr/dashboard/requirements-lint.txt
+++ b/src/pybind/mgr/dashboard/requirements-lint.txt
@@ -1,4 +1,4 @@
-pylint==2.3.1; python_version >= '3'
+pylint==2.6.0
flake8==3.7.8; python_version >= '3'
flake8-colors==0.1.6; python_version >= '3'
#TODO: Fix docstring issues: https://tracker.ceph.com/issues/41224
diff --git a/src/pybind/mgr/dashboard/services/auth.py b/src/pybind/mgr/dashboard/services/auth.py
index d829362e63..475d501263 100644
--- a/src/pybind/mgr/dashboard/services/auth.py
+++ b/src/pybind/mgr/dashboard/services/auth.py
@@ -177,7 +177,6 @@ class AuthManagerTool(cherrypy.Tool):
def _check_authorization(self, username):
self.logger.debug("checking authorization...")
- username = username
handler = cherrypy.request.handler.callable
controller = handler.__self__
sec_scope = getattr(controller, '_security_scope', None)
diff --git a/src/pybind/mgr/dashboard/services/ceph_service.py b/src/pybind/mgr/dashboard/services/ceph_service.py
index a6eee2957e..89582e3f73 100644
--- a/src/pybind/mgr/dashboard/services/ceph_service.py
+++ b/src/pybind/mgr/dashboard/services/ceph_service.py
@@ -12,7 +12,7 @@ from .. import mgr
from ..exceptions import DashboardException
try:
- from typing import Dict, Any, Union # pylint: disable=unused-import
+ from typing import Dict, Any, Union
except ImportError:
pass # For typing only
diff --git a/src/pybind/mgr/dashboard/services/cephx.py b/src/pybind/mgr/dashboard/services/cephx.py
index ccda387961..60303ad85f 100644
--- a/src/pybind/mgr/dashboard/services/cephx.py
+++ b/src/pybind/mgr/dashboard/services/cephx.py
@@ -22,7 +22,7 @@ class CephX(object):
@classmethod
def list_clients(cls):
- return [client for client in cls._clients_map()]
+ return list(cls._clients_map())
@classmethod
def get_client_key(cls, client_id):
diff --git a/src/pybind/mgr/dashboard/services/ganesha.py b/src/pybind/mgr/dashboard/services/ganesha.py
index e9144db406..764ebb3739 100644
--- a/src/pybind/mgr/dashboard/services/ganesha.py
+++ b/src/pybind/mgr/dashboard/services/ganesha.py
@@ -69,7 +69,7 @@ class Ganesha(object):
@classmethod
def get_ganesha_clusters(cls):
- return [cluster_id for cluster_id in cls._get_clusters_locations()]
+ return list(cls._get_clusters_locations())
@staticmethod
def _get_orch_nfs_instances():
@@ -325,7 +325,7 @@ class GaneshaConfParser(object):
for key, val in block.items():
if key == 'block_name':
continue
- elif key == '_blocks_':
+ if key == '_blocks_':
for blo in val:
conf_str += GaneshaConfParser.write_block(blo, depth)
elif val:
@@ -693,21 +693,21 @@ class Export(object):
result['attr_expiration_time'] = self.attr_expiration_time
result['security_label'] = self.security_label
if 'protocols' not in defaults:
- result['protocols'] = [p for p in self.protocols]
+ result['protocols'] = list(self.protocols)
else:
def_proto = defaults['protocols']
if not isinstance(def_proto, list):
def_proto = set([def_proto])
if self.protocols != def_proto:
- result['protocols'] = [p for p in self.protocols]
+ result['protocols'] = list(self.protocols)
if 'transports' not in defaults:
- result['transports'] = [t for t in self.transports]
+ result['transports'] = list(self.transports)
else:
def_transp = defaults['transports']
if not isinstance(def_transp, list):
def_transp = set([def_transp])
if self.transports != def_transp:
- result['transports'] = [t for t in self.transports]
+ result['transports'] = list(self.transports)
result['_blocks_'] = [self.fsal.to_fsal_block()]
result['_blocks_'].extend([client.to_client_block()
@@ -737,14 +737,14 @@ class Export(object):
'path': self.path,
'fsal': self.fsal.to_dict(),
'cluster_id': self.cluster_id,
- 'daemons': sorted([d for d in self.daemons]),
+ 'daemons': sorted(list(self.daemons)),
'pseudo': self.pseudo,
'tag': self.tag,
'access_type': self.access_type,
'squash': self.squash,
'security_label': self.security_label,
- 'protocols': sorted([p for p in self.protocols]),
- 'transports': sorted([t for t in self.transports]),
+ 'protocols': sorted(list(self.protocols)),
+ 'transports': sorted(list(self.transports)),
'clients': [client.to_dict() for client in self.clients]
}
@@ -992,7 +992,7 @@ class GaneshaConf(object):
return None
def list_daemons(self):
- return [daemon_id for daemon_id in self.daemons_conf_blocks]
+ return list(self.daemons_conf_blocks)
def reload_daemons(self, daemons):
with mgr.rados.open_ioctx(self.rados_pool) as ioctx:
diff --git a/src/pybind/mgr/dashboard/services/iscsi_client.py b/src/pybind/mgr/dashboard/services/iscsi_client.py
index b82a51a3d4..c5a6dfa0e7 100644
--- a/src/pybind/mgr/dashboard/services/iscsi_client.py
+++ b/src/pybind/mgr/dashboard/services/iscsi_client.py
@@ -12,7 +12,7 @@ try:
except ImportError:
from urllib.parse import urlparse
-from .iscsi_config import IscsiGatewaysConfig # pylint: disable=cyclic-import
+from .iscsi_config import IscsiGatewaysConfig
from ..settings import Settings
from ..rest_client import RestClient
diff --git a/src/pybind/mgr/dashboard/services/iscsi_config.py b/src/pybind/mgr/dashboard/services/iscsi_config.py
index ab90048500..86bdfc770d 100644
--- a/src/pybind/mgr/dashboard/services/iscsi_config.py
+++ b/src/pybind/mgr/dashboard/services/iscsi_config.py
@@ -57,7 +57,7 @@ class IscsiGatewaysConfig(object):
"""
for gateway_name, gateway_config in config['gateways'].items():
if '.' not in gateway_name:
- from .iscsi_client import IscsiClient
+ from .iscsi_client import IscsiClient # pylint: disable=cyclic-import
from ..rest_client import RequestException
try:
service_url = gateway_config['service_url']
diff --git a/src/pybind/mgr/dashboard/services/progress.py b/src/pybind/mgr/dashboard/services/progress.py
index d8cf7521fa..d7b9ed973b 100644
--- a/src/pybind/mgr/dashboard/services/progress.py
+++ b/src/pybind/mgr/dashboard/services/progress.py
@@ -12,7 +12,7 @@ from __future__ import absolute_import
from datetime import datetime
import logging
-from . import rbd
+from . import rbd # pylint: disable=no-name-in-module
from .. import mgr
diff --git a/src/pybind/mgr/dashboard/services/rgw_client.py b/src/pybind/mgr/dashboard/services/rgw_client.py
index 5507eb6800..aee18acc54 100644
--- a/src/pybind/mgr/dashboard/services/rgw_client.py
+++ b/src/pybind/mgr/dashboard/services/rgw_client.py
@@ -16,7 +16,7 @@ from ..tools import build_url, dict_contains_path, json_str_to_object,\
from .. import mgr
try:
- from typing import Dict, List, Optional # pylint: disable=unused-import
+ from typing import Dict, List, Optional
except ImportError:
pass # For typing only
@@ -303,6 +303,7 @@ class RgwClient(RestClient):
if self.userid != RgwClient._SYSTEM_USERID:
logger.info("Fetching new keys for user: %s", self.userid)
keys = RgwClient.admin_instance().get_user_keys(self.userid)
+ # pylint: disable=attribute-defined-outside-init
self.auth = S3Auth(keys['access_key'], keys['secret_key'],
service_url=self.service_url)
else:
diff --git a/src/pybind/mgr/dashboard/tests/__init__.py b/src/pybind/mgr/dashboard/tests/__init__.py
index 421378a155..8eb5bb8af1 100644
--- a/src/pybind/mgr/dashboard/tests/__init__.py
+++ b/src/pybind/mgr/dashboard/tests/__init__.py
@@ -21,7 +21,7 @@ from ..services.auth import AuthManagerTool
from ..services.exception import dashboard_exception_handler
from ..plugins import PLUGIN_MANAGER
-from ..plugins import feature_toggles, debug # noqa # pylint: disable=unused-import
+from ..plugins import feature_toggles, debug # noqa
PLUGIN_MANAGER.hook.init()
diff --git a/src/pybind/mgr/dashboard/tests/helper.py b/src/pybind/mgr/dashboard/tests/helper.py
index 9ec043d6be..06b83d42a8 100644
--- a/src/pybind/mgr/dashboard/tests/helper.py
+++ b/src/pybind/mgr/dashboard/tests/helper.py
@@ -2,7 +2,7 @@
from __future__ import absolute_import
try:
- from typing import Dict, Any # pylint: disable=unused-import
+ from typing import Dict, Any
except ImportError:
pass
diff --git a/src/pybind/mgr/dashboard/tests/test_access_control.py b/src/pybind/mgr/dashboard/tests/test_access_control.py
index 0039efc167..81604a161e 100644
--- a/src/pybind/mgr/dashboard/tests/test_access_control.py
+++ b/src/pybind/mgr/dashboard/tests/test_access_control.py
@@ -9,7 +9,7 @@ import unittest
from datetime import datetime, timedelta
-from . import CmdException, CLICommandTestMixin
+from . import CmdException, CLICommandTestMixin # pylint: disable=no-name-in-module
from .. import mgr
from ..security import Scope, Permission
from ..services.access_control import load_access_control_db, \
diff --git a/src/pybind/mgr/dashboard/tests/test_api_auditing.py b/src/pybind/mgr/dashboard/tests/test_api_auditing.py
index 0416c03638..023ea7992a 100644
--- a/src/pybind/mgr/dashboard/tests/test_api_auditing.py
+++ b/src/pybind/mgr/dashboard/tests/test_api_auditing.py
@@ -9,7 +9,7 @@ try:
except ImportError:
import unittest.mock as mock
-from . import ControllerTestCase, KVStoreMockMixin
+from . import ControllerTestCase, KVStoreMockMixin # pylint: disable=no-name-in-module
from ..controllers import RESTController, Controller
from ..tools import RequestLoggingTool
from .. import mgr
diff --git a/src/pybind/mgr/dashboard/tests/test_cephfs.py b/src/pybind/mgr/dashboard/tests/test_cephfs.py
index e9abda5380..778b0aa275 100644
--- a/src/pybind/mgr/dashboard/tests/test_cephfs.py
+++ b/src/pybind/mgr/dashboard/tests/test_cephfs.py
@@ -6,7 +6,7 @@ except ImportError:
from unittest.mock import Mock
from .. import mgr
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..controllers.cephfs import CephFS
diff --git a/src/pybind/mgr/dashboard/tests/test_controllers.py b/src/pybind/mgr/dashboard/tests/test_controllers.py
index 0e88047061..b14878ff2e 100644
--- a/src/pybind/mgr/dashboard/tests/test_controllers.py
+++ b/src/pybind/mgr/dashboard/tests/test_controllers.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..controllers import BaseController, RESTController, Controller, \
ApiController, Endpoint
diff --git a/src/pybind/mgr/dashboard/tests/test_docs.py b/src/pybind/mgr/dashboard/tests/test_docs.py
index a6e03b5267..ccb777aca5 100644
--- a/src/pybind/mgr/dashboard/tests/test_docs.py
+++ b/src/pybind/mgr/dashboard/tests/test_docs.py
@@ -1,7 +1,7 @@
# # -*- coding: utf-8 -*-
from __future__ import absolute_import
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..controllers import RESTController, ApiController, Endpoint, EndpointDoc, ControllerDoc
from ..controllers.docs import Docs
diff --git a/src/pybind/mgr/dashboard/tests/test_erasure_code_profile.py b/src/pybind/mgr/dashboard/tests/test_erasure_code_profile.py
index 557b7c1061..d266735e8f 100644
--- a/src/pybind/mgr/dashboard/tests/test_erasure_code_profile.py
+++ b/src/pybind/mgr/dashboard/tests/test_erasure_code_profile.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from .. import mgr
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..controllers.erasure_code_profile import ErasureCodeProfile
diff --git a/src/pybind/mgr/dashboard/tests/test_exceptions.py b/src/pybind/mgr/dashboard/tests/test_exceptions.py
index 2bb25da1bf..b42c356479 100644
--- a/src/pybind/mgr/dashboard/tests/test_exceptions.py
+++ b/src/pybind/mgr/dashboard/tests/test_exceptions.py
@@ -5,7 +5,7 @@ import time
import rados
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..services.ceph_service import SendCommandError
from ..controllers import RESTController, Controller, Task, Endpoint
from ..services.exception import handle_rados_error, handle_send_command_error, \
diff --git a/src/pybind/mgr/dashboard/tests/test_feature_toggles.py b/src/pybind/mgr/dashboard/tests/test_feature_toggles.py
index 031d0ef839..23068c5eda 100644
--- a/src/pybind/mgr/dashboard/tests/test_feature_toggles.py
+++ b/src/pybind/mgr/dashboard/tests/test_feature_toggles.py
@@ -7,7 +7,7 @@ try:
except ImportError:
from unittest.mock import Mock, patch
-from . import KVStoreMockMixin
+from . import KVStoreMockMixin # pylint: disable=no-name-in-module
from ..plugins.feature_toggles import FeatureToggles, Features
diff --git a/src/pybind/mgr/dashboard/tests/test_ganesha.py b/src/pybind/mgr/dashboard/tests/test_ganesha.py
index 03f1f5b551..44498ac40c 100644
--- a/src/pybind/mgr/dashboard/tests/test_ganesha.py
+++ b/src/pybind/mgr/dashboard/tests/test_ganesha.py
@@ -9,7 +9,7 @@ except ImportError:
from unittest.mock import MagicMock, Mock
import orchestrator
-from . import KVStoreMockMixin
+from . import KVStoreMockMixin # pylint: disable=no-name-in-module
from .. import mgr
from ..settings import Settings
from ..services import ganesha
diff --git a/src/pybind/mgr/dashboard/tests/test_grafana.py b/src/pybind/mgr/dashboard/tests/test_grafana.py
index 0eb46bf0f0..a5456905f2 100644
--- a/src/pybind/mgr/dashboard/tests/test_grafana.py
+++ b/src/pybind/mgr/dashboard/tests/test_grafana.py
@@ -8,7 +8,7 @@ except ImportError:
from requests import RequestException
-from . import ControllerTestCase, KVStoreMockMixin
+from . import ControllerTestCase, KVStoreMockMixin # pylint: disable=no-name-in-module
from ..controllers.grafana import Grafana
from ..grafana import GrafanaRestClient
from ..settings import Settings
diff --git a/src/pybind/mgr/dashboard/tests/test_home.py b/src/pybind/mgr/dashboard/tests/test_home.py
index c3088b7a65..c942eed9be 100644
--- a/src/pybind/mgr/dashboard/tests/test_home.py
+++ b/src/pybind/mgr/dashboard/tests/test_home.py
@@ -8,7 +8,7 @@ try:
except ImportError:
import unittest.mock as mock
-from . import ControllerTestCase, FakeFsMixin
+from . import ControllerTestCase, FakeFsMixin # pylint: disable=no-name-in-module
from .. import mgr
from ..controllers.home import HomeController, LanguageMixin
diff --git a/src/pybind/mgr/dashboard/tests/test_host.py b/src/pybind/mgr/dashboard/tests/test_host.py
index ab7286074b..191c3f1245 100644
--- a/src/pybind/mgr/dashboard/tests/test_host.py
+++ b/src/pybind/mgr/dashboard/tests/test_host.py
@@ -7,7 +7,7 @@ except ImportError:
from orchestrator import HostSpec
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..controllers.host import get_hosts, Host, HostUi
from .. import mgr
diff --git a/src/pybind/mgr/dashboard/tests/test_iscsi.py b/src/pybind/mgr/dashboard/tests/test_iscsi.py
index 962ffeb684..72d64453ac 100644
--- a/src/pybind/mgr/dashboard/tests/test_iscsi.py
+++ b/src/pybind/mgr/dashboard/tests/test_iscsi.py
@@ -10,7 +10,8 @@ try:
except ImportError:
import unittest.mock as mock
-from . import CmdException, ControllerTestCase, CLICommandTestMixin, KVStoreMockMixin
+from . import CmdException, ControllerTestCase, CLICommandTestMixin, \
+ KVStoreMockMixin # pylint: disable=no-name-in-module
from .. import mgr
from ..controllers.iscsi import Iscsi, IscsiTarget
from ..services.iscsi_client import IscsiClient
diff --git a/src/pybind/mgr/dashboard/tests/test_orchestrator.py b/src/pybind/mgr/dashboard/tests/test_orchestrator.py
index 714d59c085..9a9d179bbc 100644
--- a/src/pybind/mgr/dashboard/tests/test_orchestrator.py
+++ b/src/pybind/mgr/dashboard/tests/test_orchestrator.py
@@ -6,7 +6,7 @@ except ImportError:
from orchestrator import InventoryHost
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from .. import mgr
from ..controllers.orchestrator import get_device_osd_map
from ..controllers.orchestrator import Orchestrator
diff --git a/src/pybind/mgr/dashboard/tests/test_osd.py b/src/pybind/mgr/dashboard/tests/test_osd.py
index aeb32ed576..063705ddbb 100644
--- a/src/pybind/mgr/dashboard/tests/test_osd.py
+++ b/src/pybind/mgr/dashboard/tests/test_osd.py
@@ -11,11 +11,11 @@ except ImportError:
from ceph.deployment.drive_group import DeviceSelection, DriveGroupSpec
from ceph.deployment.service_spec import PlacementSpec
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..controllers.osd import Osd
from ..tools import NotificationQueue, TaskManager
from .. import mgr
-from .helper import update_dict
+from .helper import update_dict # pylint: disable=import-error
try:
from typing import List, Dict, Any # pylint: disable=unused-import
diff --git a/src/pybind/mgr/dashboard/tests/test_plugin_debug.py b/src/pybind/mgr/dashboard/tests/test_plugin_debug.py
index 4985540046..cb4d1afc21 100644
--- a/src/pybind/mgr/dashboard/tests/test_plugin_debug.py
+++ b/src/pybind/mgr/dashboard/tests/test_plugin_debug.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-from . import CLICommandTestMixin, ControllerTestCase
+from . import CLICommandTestMixin, ControllerTestCase # pylint: disable=no-name-in-module
class TestPluginDebug(ControllerTestCase, CLICommandTestMixin):
diff --git a/src/pybind/mgr/dashboard/tests/test_pool.py b/src/pybind/mgr/dashboard/tests/test_pool.py
index e33e436540..179a8feeed 100644
--- a/src/pybind/mgr/dashboard/tests/test_pool.py
+++ b/src/pybind/mgr/dashboard/tests/test_pool.py
@@ -6,7 +6,7 @@ try:
except ImportError:
import unittest.mock as mock
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..controllers.pool import Pool
from ..controllers.task import Task
from ..tools import NotificationQueue, TaskManager
diff --git a/src/pybind/mgr/dashboard/tests/test_prometheus.py b/src/pybind/mgr/dashboard/tests/test_prometheus.py
index 3385d66a97..ef669a6203 100644
--- a/src/pybind/mgr/dashboard/tests/test_prometheus.py
+++ b/src/pybind/mgr/dashboard/tests/test_prometheus.py
@@ -5,7 +5,7 @@ try:
except ImportError:
from unittest.mock import patch
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from .. import mgr
from ..controllers.prometheus import Prometheus, PrometheusReceiver, PrometheusNotifications
diff --git a/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py b/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py
index ecb4856dc1..d7e0c7dd1e 100644
--- a/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py
+++ b/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py
@@ -6,7 +6,7 @@ try:
except ImportError:
import unittest.mock as mock
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from .. import mgr
from ..controllers.summary import Summary
from ..controllers.rbd_mirroring import RbdMirroring, RbdMirroringSummary, \
diff --git a/src/pybind/mgr/dashboard/tests/test_rest_tasks.py b/src/pybind/mgr/dashboard/tests/test_rest_tasks.py
index e9d7907f05..aa158cd288 100644
--- a/src/pybind/mgr/dashboard/tests/test_rest_tasks.py
+++ b/src/pybind/mgr/dashboard/tests/test_rest_tasks.py
@@ -8,7 +8,7 @@ try:
except ImportError:
import unittest.mock as mock
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..controllers import Controller, RESTController, Task
from ..controllers.task import Task as TaskController
from ..services import progress
diff --git a/src/pybind/mgr/dashboard/tests/test_rgw.py b/src/pybind/mgr/dashboard/tests/test_rgw.py
index 2c90e7d11b..11818ca2b7 100644
--- a/src/pybind/mgr/dashboard/tests/test_rgw.py
+++ b/src/pybind/mgr/dashboard/tests/test_rgw.py
@@ -3,7 +3,7 @@ try:
except ImportError:
import unittest.mock as mock
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..controllers.rgw import RgwUser
diff --git a/src/pybind/mgr/dashboard/tests/test_rgw_client.py b/src/pybind/mgr/dashboard/tests/test_rgw_client.py
index d69ab2f48d..fa711b45ca 100644
--- a/src/pybind/mgr/dashboard/tests/test_rgw_client.py
+++ b/src/pybind/mgr/dashboard/tests/test_rgw_client.py
@@ -9,7 +9,7 @@ except ImportError:
from ..services.rgw_client import RgwClient, _parse_frontend_config
from ..settings import Settings
-from . import KVStoreMockMixin
+from . import KVStoreMockMixin # pylint: disable=no-name-in-module
class RgwClientTest(unittest.TestCase, KVStoreMockMixin):
diff --git a/src/pybind/mgr/dashboard/tests/test_settings.py b/src/pybind/mgr/dashboard/tests/test_settings.py
index da54a20655..abdb059c1d 100644
--- a/src/pybind/mgr/dashboard/tests/test_settings.py
+++ b/src/pybind/mgr/dashboard/tests/test_settings.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import
import errno
import unittest
-from . import KVStoreMockMixin, ControllerTestCase
+from . import KVStoreMockMixin, ControllerTestCase # pylint: disable=no-name-in-module
from .. import settings
from ..controllers.settings import Settings as SettingsController
from ..settings import Settings, handle_option_command
diff --git a/src/pybind/mgr/dashboard/tests/test_sso.py b/src/pybind/mgr/dashboard/tests/test_sso.py
index f8681b89ed..e8141a09cc 100644
--- a/src/pybind/mgr/dashboard/tests/test_sso.py
+++ b/src/pybind/mgr/dashboard/tests/test_sso.py
@@ -5,7 +5,8 @@ from __future__ import absolute_import
import errno
import unittest
-from . import CmdException, exec_dashboard_cmd, KVStoreMockMixin
+from . import CmdException, exec_dashboard_cmd, \
+ KVStoreMockMixin # pylint: disable=no-name-in-module
from ..services.sso import handle_sso_command, load_sso_db
diff --git a/src/pybind/mgr/dashboard/tests/test_tools.py b/src/pybind/mgr/dashboard/tests/test_tools.py
index 0f27ec8e63..340ff8c41d 100644
--- a/src/pybind/mgr/dashboard/tests/test_tools.py
+++ b/src/pybind/mgr/dashboard/tests/test_tools.py
@@ -10,7 +10,7 @@ try:
except ImportError:
from unittest.mock import patch
-from . import ControllerTestCase
+from . import ControllerTestCase # pylint: disable=no-name-in-module
from ..services.exception import handle_rados_error
from ..controllers import RESTController, ApiController, Controller, \
BaseController, Proxy
diff --git a/src/pybind/mgr/dashboard/tools.py b/src/pybind/mgr/dashboard/tools.py
index 2b6d92ca55..d9a2d813c0 100644
--- a/src/pybind/mgr/dashboard/tools.py
+++ b/src/pybind/mgr/dashboard/tools.py
@@ -30,7 +30,7 @@ from .services.auth import JwtManager
try:
from typing import Any, AnyStr, Callable, DefaultDict, Deque,\
- Dict, List, Set, Tuple, Union # noqa pylint: disable=unused-import
+ Dict, List, Set, Tuple, Union # noqa
except ImportError:
pass # For typing only

65
ceph/qa-src-update-mypy-to-0.782.patch Normal file
View File

@ -0,0 +1,65 @@
From a61e8e3b6052bf158fe63ab1cd66197f4ffc3900 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 25 Jun 2020 14:11:54 +0200
Subject: [PATCH] qa,src: update mypy to 0.782
(cherry picked from commit 78f3473f55afe14698dc702e24cf34030223a373)
---
qa/tox.ini | 2 +-
src/pybind/mgr/dashboard/rest_client.py | 2 +-
src/pybind/mgr/tox.ini | 2 +-
src/python-common/requirements.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/qa/tox.ini b/qa/tox.ini
index 31a1ef4fd4..33ad2db968 100644
--- a/qa/tox.ini
+++ b/qa/tox.ini
@@ -16,7 +16,7 @@ commands=flake8 --select=F,E9 --exclude=venv,.tox
[testenv:mypy]
basepython = python3
-deps = mypy==0.770
+deps = mypy==0.782
commands = mypy {posargs:.}
[testenv:pytest]
diff --git a/src/pybind/mgr/dashboard/rest_client.py b/src/pybind/mgr/dashboard/rest_client.py
index 4d58d0dfde..7c04f36a0d 100644
--- a/src/pybind/mgr/dashboard/rest_client.py
+++ b/src/pybind/mgr/dashboard/rest_client.py
@@ -511,7 +511,7 @@ class RestClient(object):
resp_structure = api_kwargs.get('resp_structure', None)
args_name = inspect.getargspec(func).args
args_dict = dict(zip(args_name[1:], args))
- for key, val in kwargs:
+ for key, val in kwargs.items():
args_dict[key] = val
return func(
self,
diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 3e129ba64e..4c65be7f16 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -47,7 +47,7 @@ basepython = python3
deps =
cython
-rrequirements.txt
- mypy==0.770
+ mypy==0.782
commands =
mypy --config-file=../../mypy.ini \
cephadm/module.py \
diff --git a/src/python-common/requirements.txt b/src/python-common/requirements.txt
index a269fada78..7df43fb736 100644
--- a/src/python-common/requirements.txt
+++ b/src/python-common/requirements.txt
@@ -1,7 +1,7 @@
six
pytest >=2.1.3,<5; python_version < '3.5'
mock; python_version < '3.3'
-mypy==0.770; python_version >= '3'
+mypy==0.782; python_version >= '3'
pytest-mypy; python_version >= '3'
pytest >= 2.1.3; python_version >= '3'
pyyaml

28
chromium/PKGBUILD
View File

@ -1,7 +1,7 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
pkgname=chromium
pkgver=86.0.4240.111
pkgrel=1
pkgver=87.0.4280.88
pkgrel=2
pkgdesc="Google Chromium, sans integration with Google - PPC64LE FORK"
arch=(x86_64 powerpc64le)
url="https://github.com/leo-lb/ungoogled-chromium/tree/master"
@ -20,16 +20,20 @@ optdepends=('libpipewire02: WebRTC desktop sharing under Wayland'
'kdialog: needed for file dialogs in KDE'
'org.freedesktop.secrets: password storage backend on GNOME / Xfce'
'kwallet: for storing passwords in KWallet on KDE desktops')
_gcc_patchset=3
commit='ba1c91367e7adb81d662e4fb9f88cae6f7d5db54'
_gcc_patchset=9
commit='cd6671880fc7eddb36d1fa6f43e4159f8e171de0'
source=("git+https://github.com/leo-lb/ungoogled-chromium.git#commit=${commit}"
https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz
check-for-enable-accelerated-video-decode-on-Linux.patch
chromium-skia-harmony.patch)
chromium-skia-harmony.patch
chromium-icu68.patch
subpixel-anti-aliasing-in-FreeType-2.8.1.patch)
sha256sums=('SKIP'
'93420e4d5a061604cda4cf7fdd576489a8327b3a2bbc9aa8216a479d81b9c7be'
'c99934bcd2f3ae8ea9620f5f59a94338b2cf739647f04c28c8a551d9083fa7e9'
'03d03a39b2afa40083eb8ccb9616a51619f71da92348effc8ee289cbda10128b'
'771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1')
'771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
'02cfa7fc75f4df44044efb35aeeb0dba85b250e5cabe991fd381221862b2e5d7'
'1e2913e21c491d546e05f9b4edf5a6c7a22d89ed0b36ef692ca6272bcd5faec6')
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
# Keys are the names in the above script; values are the dependencies in Arch
@ -94,14 +98,16 @@ prepare() {
third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
third_party/libxml/chromium/*.cc
# Upstream fixes
patch -Np1 -i ${srcdir}/check-for-enable-accelerated-video-decode-on-Linux.patch
patch -Np1 -d third_party/skia <${srcdir}/subpixel-anti-aliasing-in-FreeType-2.8.1.patch
# Fixes for building with libstdc++ instead of libc++
patch -Np1 -i ${srcdir}/patches/chromium-86-nearby-include.patch
patch -Np1 -i ${srcdir}/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
patch -Np1 -i ${srcdir}/patches/chromium-87-openscreen-include.patch
# https://crbug.com/skia/6663#c10
patch -Np0 -i ${srcdir}/chromium-skia-harmony.patch
# fix for icu 68
patch -Np2 -i ${srcdir}/chromium-icu68.patch
# Force script incompatible with Python 3 to use /usr/bin/python2
sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py

261
chromium/chromium-icu68.patch Normal file
View File

@ -0,0 +1,261 @@
--- build/src/base/i18n/string_compare.cc.orig 2020-11-07 21:57:18.831945969 +0100
+++ build/src/base/i18n/string_compare.cc 2020-11-07 21:57:36.681099042 +0100
@@ -18,8 +18,8 @@
StringPiece16 rhs) {
UErrorCode error = U_ZERO_ERROR;
UCollationResult result = collator.compare(
- icu::UnicodeString(FALSE, lhs.data(), static_cast<int>(lhs.length())),
- icu::UnicodeString(FALSE, rhs.data(), static_cast<int>(rhs.length())),
+ icu::UnicodeString(false, lhs.data(), static_cast<int>(lhs.length())),
+ icu::UnicodeString(false, rhs.data(), static_cast<int>(rhs.length())),
error);
DCHECK(U_SUCCESS(error));
return result;
--- build/src/base/i18n/time_formatting.cc.orig 2020-11-07 22:00:51.929875115 +0100
+++ build/src/base/i18n/time_formatting.cc 2020-11-07 22:01:08.508157940 +0100
@@ -240,7 +240,7 @@
icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
measure_format.formatMeasures(measures, 3, formatted, ignore, status);
*out = i18n::UnicodeStringToString16(formatted);
- return U_SUCCESS(status) == TRUE;
+ return U_SUCCESS(status) == true;
}
string16 DateIntervalFormat(const Time& begin_time,
--- build/src/components/url_formatter/spoof_checks/skeleton_generator.cc.orig 2020-11-07 22:11:27.615031896 +0100
+++ build/src/components/url_formatter/spoof_checks/skeleton_generator.cc 2020-11-07 22:11:42.425497873 +0100
@@ -116,7 +116,7 @@
Skeletons SkeletonGenerator::GetSkeletons(base::StringPiece16 hostname) {
Skeletons skeletons;
size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1 : 0);
- icu::UnicodeString host(FALSE, hostname.data(), hostname_length);
+ icu::UnicodeString host(false, hostname.data(), hostname_length);
// If input has any characters outside Latin-Greek-Cyrillic and [0-9._-],
// there is no point in getting rid of diacritics because combining marks
// attached to non-LGC characters are already blocked.
--- build/src/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2020-11-07 22:36:40.984864086 +0100
+++ build/src/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc 2020-11-07 22:36:51.320814410 +0100
@@ -327,7 +327,7 @@
DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING)
<< "ICU ambiguous alias warning for encoding: " << encoding_.GetName();
if (converter_icu_)
- ucnv_setFallback(converter_icu_, TRUE);
+ ucnv_setFallback(converter_icu_, true);
}
int TextCodecICU::DecodeToBuffer(UChar* target,
--- build/src/ui/base/l10n/formatter.cc 2020-11-08 00:11:00.805955607 +0100
+++ build/src/ui/base/l10n/formatter.cc.orig 2020-11-08 00:10:41.660845502 +0100
@@ -234,7 +234,7 @@
int value,
icu::UnicodeString* formatted_string) const {
DCHECK(simple_format_[unit]);
- DCHECK(formatted_string->isEmpty() == TRUE);
+ DCHECK(formatted_string->isEmpty() == true);
UErrorCode error = U_ZERO_ERROR;
FormatNumberInPlural(*simple_format_[unit],
value, formatted_string, &error);
@@ -250,7 +250,7 @@
<< "Detailed() not implemented for your (format, length) combination!";
DCHECK(detailed_format_[units][1])
<< "Detailed() not implemented for your (format, length) combination!";
- DCHECK(formatted_string->isEmpty() == TRUE);
+ DCHECK(formatted_string->isEmpty() == true);
UErrorCode error = U_ZERO_ERROR;
FormatNumberInPlural(*detailed_format_[units][0], value_1,
formatted_string, &error);
@@ -283,7 +283,7 @@
base::string16 pattern = l10n_util::GetStringUTF16(pluralities.id);
UErrorCode error = U_ZERO_ERROR;
std::unique_ptr<icu::MessageFormat> format(new icu::MessageFormat(
- icu::UnicodeString(FALSE, pattern.data(), pattern.length()), error));
+ icu::UnicodeString(false, pattern.data(), pattern.length()), error));
DCHECK(U_SUCCESS(error));
if (format.get())
return format;
--- build/src/components/autofill/core/common/autofill_regexes.cc 2020-11-08 00:34:41.896828730 +0100
+++ build/src/components/autofill/core/common/autofill_regexes.cc.orig 2020-11-08 00:34:20.674927821 +0100
@@ -43,7 +43,7 @@
icu::RegexMatcher* AutofillRegexes::GetMatcher(const base::string16& pattern) {
auto it = matchers_.find(pattern);
if (it == matchers_.end()) {
- const icu::UnicodeString icu_pattern(FALSE, pattern.data(),
+ const icu::UnicodeString icu_pattern(false, pattern.data(),
pattern.length());
UErrorCode status = U_ZERO_ERROR;
@@ -71,21 +71,21 @@
base::AutoLock lock(*g_lock);
icu::RegexMatcher* matcher = g_autofill_regexes->GetMatcher(pattern);
- icu::UnicodeString icu_input(FALSE, input.data(), input.length());
+ icu::UnicodeString icu_input(false, input.data(), input.length());
matcher->reset(icu_input);
UErrorCode status = U_ZERO_ERROR;
UBool matched = matcher->find(0, status);
DCHECK(U_SUCCESS(status));
- if (matched == TRUE && match) {
+ if (matched == true && match) {
icu::UnicodeString match_unicode =
matcher->group(group_to_be_captured, status);
DCHECK(U_SUCCESS(status));
*match = base::i18n::UnicodeStringToString16(match_unicode);
}
- return matched == TRUE;
+ return matched == true;
}
} // namespace autofill
--- build/src/components/signin/public/identity_manager/identity_utils.cc.orig 2020-11-08 00:53:12.624659420 +0100
+++ build/src/components/signin/public/identity_manager/identity_utils.cc 2020-11-08 00:53:18.887036727 +0100
@@ -32,7 +32,7 @@
// See if the username matches the policy-provided pattern.
UErrorCode status = U_ZERO_ERROR;
- const icu::UnicodeString icu_pattern(FALSE, utf16_pattern.data(),
+ const icu::UnicodeString icu_pattern(false, utf16_pattern.data(),
utf16_pattern.length());
icu::RegexMatcher matcher(icu_pattern, UREGEX_CASE_INSENSITIVE, status);
if (!U_SUCCESS(status)) {
--- build/src/components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2020-11-08 10:17:09.710294110 +0100
+++ build/src/components/url_formatter/spoof_checks/idn_spoof_checker.cc 2020-11-08 10:17:38.904204303 +0100
@@ -368,7 +368,7 @@
return Result::kICUSpoofChecks;
}
- icu::UnicodeString label_string(FALSE /* isTerminated */, label.data(),
+ icu::UnicodeString label_string(false /* isTerminated */, label.data(),
base::checked_cast<int32_t>(label.size()));
// A punycode label with 'xn--' prefix is not subject to the URL
@@ -711,7 +711,7 @@
base::StringPiece tld,
base::StringPiece16 tld_unicode) {
icu::UnicodeString tld_string(
- FALSE /* isTerminated */, tld_unicode.data(),
+ false /* isTerminated */, tld_unicode.data(),
base::checked_cast<int32_t>(tld_unicode.size()));
// Allow if the TLD contains any letter from the script, in which case it's
// likely to be a TLD in that script.
--- build/src/content/zygote/zygote_linux.cc.orig 2020-11-08 12:22:43.440632116 +0100
+++ build/src/content/zygote/zygote_linux.cc 2020-11-08 12:22:53.928588026 +0100
@@ -565,7 +565,7 @@
if (!iter.ReadString16(&timezone_id))
return -1;
icu::TimeZone::adoptDefault(icu::TimeZone::createTimeZone(
- icu::UnicodeString(FALSE, timezone_id.data(), timezone_id.length())));
+ icu::UnicodeString(false, timezone_id.data(), timezone_id.length())));
if (!iter.ReadInt(&numfds))
return -1;
--- build/src/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc.orig 2020-11-08 15:36:02.750895160 +0100
+++ build/src/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc 2020-11-08 15:36:51.338117758 +0100
@@ -312,13 +312,13 @@
text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
? static_cast<int32_t>(offset)
: 0;
- is_accessible = TRUE;
+ is_accessible = true;
return true;
}
if (native_index >= native_length &&
text->chunkNativeLimit == native_length) {
text->chunkOffset = text->chunkLength;
- is_accessible = FALSE;
+ is_accessible = false;
return true;
}
} else {
@@ -331,12 +331,12 @@
text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
? static_cast<int32_t>(offset)
: 0;
- is_accessible = TRUE;
+ is_accessible = true;
return true;
}
if (native_index <= 0 && !text->chunkNativeStart) {
text->chunkOffset = 0;
- is_accessible = FALSE;
+ is_accessible = false;
return true;
}
}
@@ -347,7 +347,7 @@
int64_t native_index,
UBool forward) {
if (!text->context)
- return FALSE;
+ return false;
int64_t native_length = TextNativeLength(text);
UBool is_accessible;
if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
@@ -371,7 +371,7 @@
DCHECK_EQ(new_context, kPriorContext);
TextLatin1SwitchToPriorContext(text, native_index, native_length, forward);
}
- return TRUE;
+ return true;
}
static const struct UTextFuncs kTextLatin1Funcs = {
@@ -511,7 +511,7 @@
static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) {
if (!text->context)
- return FALSE;
+ return false;
int64_t native_length = TextNativeLength(text);
UBool is_accessible;
if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
@@ -533,7 +533,7 @@
DCHECK_EQ(new_context, kPriorContext);
TextUTF16SwitchToPriorContext(text, native_index, native_length, forward);
}
- return TRUE;
+ return true;
}
static const struct UTextFuncs kTextUTF16Funcs = {
--- build/src/third_party/blink/renderer/platform/text/locale_icu.cc.orig 2020-11-08 15:43:18.148837903 +0100
+++ build/src/third_party/blink/renderer/platform/text/locale_icu.cc 2020-11-08 15:43:31.348524958 +0100
@@ -169,12 +169,12 @@
return g_empty_string;
UErrorCode status = U_ZERO_ERROR;
- int32_t length = udat_toPattern(date_format, TRUE, nullptr, 0, &status);
+ int32_t length = udat_toPattern(date_format, true, nullptr, 0, &status);
if (status != U_BUFFER_OVERFLOW_ERROR || !length)
return g_empty_string;
StringBuffer<UChar> buffer(length);
status = U_ZERO_ERROR;
- udat_toPattern(date_format, TRUE, buffer.Characters(), length, &status);
+ udat_toPattern(date_format, true, buffer.Characters(), length, &status);
if (U_FAILURE(status))
return g_empty_string;
return String::Adopt(buffer);
--- build/src/third_party/blink/renderer/platform/text/unicode_utilities.cc.orig 2020-11-08 15:45:53.399372206 +0100
+++ build/src/third_party/blink/renderer/platform/text/unicode_utilities.cc 2020-11-08 15:46:02.903423863 +0100
@@ -300,7 +300,7 @@
DCHECK(U_SUCCESS(status));
int32_t input_length = static_cast<int32_t>(length);
// copy-on-write.
- icu::UnicodeString normalized(FALSE, characters, input_length);
+ icu::UnicodeString normalized(false, characters, input_length);
// In the vast majority of cases, input is already NFC. Run a quick check
// to avoid normalizing the entire input unnecessarily.
int32_t normalized_prefix_length =
--- build/src/components/spellcheck/renderer/spellcheck_worditerator.cc.orig 2020-11-08 16:01:32.646165648 +0100
+++ build/src/components/spellcheck/renderer/spellcheck_worditerator.cc 2020-11-08 16:01:41.751273928 +0100
@@ -442,7 +442,7 @@
// spellchecker and we need manual normalization as well. The normalized
// text does not have to be NUL-terminated since its characters are copied to
// string16, which adds a NUL character when we need.
- icu::UnicodeString input(FALSE, &text_[input_start],
+ icu::UnicodeString input(false, &text_[input_start],
base::checked_cast<int32_t>(input_length));
UErrorCode status = U_ZERO_ERROR;
icu::UnicodeString output;

100
chromium/subpixel-anti-aliasing-in-FreeType-2.8.1.patch Normal file
View File

@ -0,0 +1,100 @@
From f25787b72c20e97cdeb74e037dc1ff56a88b45c6 Mon Sep 17 00:00:00 2001
From: Ben Wagner <bungeman@google.com>
Date: Tue, 1 Dec 2020 20:22:00 -0500
Subject: [PATCH] Subpixel anti-aliasing in FreeType 2.8.1+
FreeType 2.8.1 and later always provide some form of subpixel
anti-aliasing.
Bug: skia:10950,skia:6663
Change-Id: I666cc942e73b73073cdabf900c25faa10d9aaf0f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/339861
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
---
src/ports/SkFontHost_FreeType.cpp | 33 ++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 990eff4f5e..c0aeb792da 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -32,6 +32,7 @@
#include "src/utils/SkMatrix22.h"
#include <memory>
+#include <tuple>
#include <ft2build.h>
#include FT_ADVANCES_H
@@ -147,13 +148,16 @@ public:
// *reinterpret_cast<void**>(&procPtr) = dlsym(self, "proc");
// because clang has not implemented DR573. See http://clang.llvm.org/cxx_dr_status.html .
- FT_Int major, minor, patch;
- FT_Library_Version(fLibrary, &major, &minor, &patch);
+ using Version = std::tuple<FT_Int, FT_Int, FT_Int>;
+ Version version;
+ FT_Library_Version(fLibrary, &std::get<0>(version),
+ &std::get<1>(version),
+ &std::get<2>(version));
#if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02070100
fGetVarDesignCoordinates = FT_Get_Var_Design_Coordinates;
#elif SK_FREETYPE_MINIMUM_RUNTIME_VERSION & SK_FREETYPE_DLOPEN
- if (major > 2 || ((major == 2 && minor > 7) || (major == 2 && minor == 7 && patch >= 0))) {
+ if (Version(2,7,0) <= version) {
//The FreeType library is already loaded, so symbols are available in process.
void* self = dlopen(nullptr, RTLD_LAZY);
if (self) {
@@ -166,7 +170,7 @@ public:
#if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02070200
FT_Set_Default_Properties(fLibrary);
#elif SK_FREETYPE_MINIMUM_RUNTIME_VERSION & SK_FREETYPE_DLOPEN
- if (major > 2 || ((major == 2 && minor > 7) || (major == 2 && minor == 7 && patch >= 1))) {
+ if (Version(2,7,1) <= version) {
//The FreeType library is already loaded, so symbols are available in process.
void* self = dlopen(nullptr, RTLD_LAZY);
if (self) {
@@ -185,7 +189,7 @@ public:
#if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02080000
fLightHintingIsYOnly = true;
#else
- if (major > 2 || ((major == 2 && minor > 8) || (major == 2 && minor == 8 && patch >= 0))) {
+ if (Version(2,8,0) <= version) {
fLightHintingIsYOnly = true;
}
#endif
@@ -194,7 +198,7 @@ public:
#if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02080100
fGetVarAxisFlags = FT_Get_Var_Axis_Flags;
#elif SK_FREETYPE_MINIMUM_RUNTIME_VERSION & SK_FREETYPE_DLOPEN
- if (major > 2 || ((major == 2 && minor > 7) || (major == 2 && minor == 7 && patch >= 0))) {
+ if (Version(2,7,0) <= version) {
//The FreeType library is already loaded, so symbols are available in process.
void* self = dlopen(nullptr, RTLD_LAZY);
if (self) {
@@ -204,11 +208,18 @@ public:
}
#endif
- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
- // The default has changed over time, so this doesn't mean the same thing to all users.
- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
- fIsLCDSupported = true;
- fLCDExtra = 2; //Using a filter adds one full pixel to each side.
+ fIsLCDSupported =
+ // Subpixel anti-aliasing may be unfiltered until the LCD filter is set.
+ // Newer versions may still need this, so this test with side effects must come first.
+ // The default has changed over time, so this doesn't mean the same thing to all users.
+ (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) ||
+
+ // In 2.8.1 and later FreeType always provides some form of subpixel anti-aliasing.
+ ((SK_FREETYPE_MINIMUM_RUNTIME_VERSION) >= 0x02080100) ||
+ (Version(2,8,1) <= version);
+
+ if (fIsLCDSupported) {
+ fLCDExtra = 2; // Using a filter may require up to one full pixel to each side.
}
}
~FreeTypeLibrary() {

14
cifs-utils/PKGBUILD
View File

@ -2,21 +2,29 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cifs-utils
pkgver=6.11
pkgrel=1
pkgrel=3
pkgdesc="CIFS filesystem user-space tools"
arch=( x86_64 powerpc64le powerpc )
url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
license=('GPL')
depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'smbclient' 'pam')
makedepends=('python-docutils')
source=("https://download.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2"{,.asc})
source=("https://download.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2"{,.asc}
"cifs-utils-6.11_fix_capng_apply_for_libcap-ng-0.8.1.patch"
"cifs-utils-6.11_fix_capng_apply_for_libcap-ng-0.8.1_part-2.patch")
validpgpkeys=('C699981A31F338706C817650DF5BA9D30642D5A0') #cifs-utils Distribution Verification Key <cifs-utils@samba.org>
sha256sums=('b859239a3f204f8220d3e54ed43bf8109e1ef202042dd87ba87492f8878728d9'
'SKIP')
'SKIP'
'0edcd01eb3e721a5726cc00160667dc2f7c935883bad71711288488081f81e5b'
'acdf75f2d3895d60414f19b2401f3349af23252717bf669529848f9d35d70604')
prepare() {
# Fix install to honor DESTDIR
sed -e 's|\$(man8dir)|$(DESTDIR)$(man8dir)|g' -e 's|cd \$(ROOTSBINDIR)|cd $(DESTDIR)$(ROOTSBINDIR)|g' -i $pkgname-$pkgver/Makefile.am
cd "$srcdir/$pkgname-$pkgver"
patch -Np1 -i "$srcdir/cifs-utils-6.11_fix_capng_apply_for_libcap-ng-0.8.1.patch"
patch -Np1 -i "$srcdir/cifs-utils-6.11_fix_capng_apply_for_libcap-ng-0.8.1_part-2.patch"
}
build() {

101
cifs-utils/cifs-utils-6.11_fix_capng_apply_for_libcap-ng-0.8.1.patch Normal file
View File

@ -0,0 +1,101 @@
From f4e7c84467152624a288351321c8664dbf3364af Mon Sep 17 00:00:00 2001
From: Jonas Witschel <diabonas@archlinux.org>
Date: Sat, 21 Nov 2020 11:41:26 +0100
Subject: [PATCH 1/2] mount.cifs: update the cap bounding set only when
CAP_SETPCAP is given
libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error
of -4 when trying to update the capability bounding set without having the
CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng
silently skipped updating the bounding set and only updated the normal
CAPNG_SELECT_CAPS capabilities instead.
Check beforehand whether we have CAP_SETPCAP, in which case we can use
CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set.
Otherwise, we can at least update the normal capabilities, but refrain from
trying to update the bounding set to avoid getting an error.
Signed-off-by: Jonas Witschel <diabonas@archlinux.org>
---
mount.cifs.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/mount.cifs.c b/mount.cifs.c
index 4feb397..88b8b69 100644
--- a/mount.cifs.c
+++ b/mount.cifs.c
@@ -338,6 +338,8 @@ static int set_password(struct parsed_mount_info *parsed_info, const char *src)
static int
drop_capabilities(int parent)
{
+ capng_select_t set = CAPNG_SELECT_CAPS;
+
capng_setpid(getpid());
capng_clear(CAPNG_SELECT_BOTH);
if (parent) {
@@ -355,7 +357,10 @@ drop_capabilities(int parent)
return EX_SYSERR;
}
}
- if (capng_apply(CAPNG_SELECT_BOTH)) {
+ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
+ set = CAPNG_SELECT_BOTH;
+ }
+ if (capng_apply(set)) {
fprintf(stderr, "Unable to apply new capability set.\n");
return EX_SYSERR;
}
--
2.29.2
From 64dfbafe7a0639a96d67f0b840b6e6498e1f68a9 Mon Sep 17 00:00:00 2001
From: Jonas Witschel <diabonas@archlinux.org>
Date: Sat, 21 Nov 2020 11:48:33 +0100
Subject: [PATCH 2/2] cifs.upall: update the cap bounding set only when
CAP_SETPCAP is given
libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error
of -4 when trying to update the capability bounding set without having the
CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng
silently skipped updating the bounding set and only updated the normal
CAPNG_SELECT_CAPS capabilities instead.
Check beforehand whether we have CAP_SETPCAP, in which case we can use
CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set.
Otherwise, we can at least update the normal capabilities, but refrain from
trying to update the bounding set to avoid getting an error.
Signed-off-by: Jonas Witschel <diabonas@archlinux.org>
---
cifs.upcall.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/cifs.upcall.c b/cifs.upcall.c
index 1559434..af1a0b0 100644
--- a/cifs.upcall.c
+++ b/cifs.upcall.c
@@ -88,6 +88,8 @@ typedef enum _sectype {
static int
trim_capabilities(bool need_environ)
{
+ capng_select_t set = CAPNG_SELECT_CAPS;
+
capng_clear(CAPNG_SELECT_BOTH);
/* SETUID and SETGID to change uid, gid, and grouplist */
@@ -105,7 +107,10 @@ trim_capabilities(bool need_environ)
return 1;
}
- if (capng_apply(CAPNG_SELECT_BOTH)) {
+ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
+ set = CAPNG_SELECT_BOTH;
+ }
+ if (capng_apply(set)) {
syslog(LOG_ERR, "%s: Unable to apply capability set: %m\n", __func__);
return 1;
}
--
2.29.2

58
cifs-utils/cifs-utils-6.11_fix_capng_apply_for_libcap-ng-0.8.1_part-2.patch Normal file
View File

@ -0,0 +1,58 @@
From 0fddcee4b1b9c9f16b3cfe1b2daec87d2b8b19dd Mon Sep 17 00:00:00 2001
From: Alexander Koch <mail@alexanderkoch.net>
Date: Wed, 16 Dec 2020 18:02:31 +0100
Subject: [PATCH] cifs.upcall: drop bounding capabilities only if CAP_SETPCAP
is given
Make drop_call_capabilities() in cifs.upcall update the bounding capabilities
only if CAP_SETCAP is present.
This is an addendum to the patch recently provided in [1]. Without this
additional change, cifs.upcall can still fail while trying to mount a CIFS
network share with krb5:
kernel: CIFS: Attempting to mount //server.domain.lan/myshare
cifs.upcall[39484]: key description: cifs.spnego;0;0;39010000;ver=0x2;host=server.domain.lan>
cifs.upcall[39484]: ver=2
cifs.upcall[39484]: host=server.domain.lan
cifs.upcall[39484]: ip=172.22.3.14
cifs.upcall[39484]: sec=1
cifs.upcall[39484]: uid=1000
cifs.upcall[39484]: creduid=1000
cifs.upcall[39484]: user=username
cifs.upcall[39484]: pid=39481
cifs.upcall[39484]: get_cachename_from_process_env: pathname=/proc/39481/environ
cifs.upcall[39484]: get_cachename_from_process_env: cachename = FILE:/tmp/.krb5cc_1000
cifs.upcall[39484]: drop_all_capabilities: Unable to apply capability set: Success
cifs.upcall[39484]: Exit status 1
[1] https://marc.info/?l=linux-cifs&m=160595758021261
Signed-off-by: Alexander Koch <mail@alexanderkoch.net>
Signed-off-by: Jonas Witschel <diabonas@archlinux.org>
---
cifs.upcall.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/cifs.upcall.c b/cifs.upcall.c
index 1559434..b62ab50 100644
--- a/cifs.upcall.c
+++ b/cifs.upcall.c
@@ -115,8 +115,13 @@ trim_capabilities(bool need_environ)
static int
drop_all_capabilities(void)
{
+ capng_select_t set = CAPNG_SELECT_CAPS;
+
capng_clear(CAPNG_SELECT_BOTH);
- if (capng_apply(CAPNG_SELECT_BOTH)) {
+ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
+ set = CAPNG_SELECT_BOTH;
+ }
+ if (capng_apply(set)) {
syslog(LOG_ERR, "%s: Unable to apply capability set: %m\n", __func__);
return 1;
}
--
2.29.2

4
clang/PKGBUILD
View File

@ -4,7 +4,7 @@
pkgname=clang
pkgver=11.0.0
pkgrel=1
pkgrel=3
pkgdesc="C language family frontend for LLVM"
arch=( x86_64 powerpc64le powerpc )
url="https://clang.llvm.org/"
@ -121,7 +121,7 @@ package() {
sed -i 's|libexec|lib/clang|' "$pkgdir/usr/bin/scan-build"
# Install Python bindings
for _py in 2.7 3.8; do
for _py in 2.7 3.9; do
install -d "$pkgdir/usr/lib/python$_py/site-packages"
cp -a ../bindings/python/clang "$pkgdir/usr/lib/python$_py/site-packages/"
_python${_py%%.*}_optimize "$pkgdir/usr/lib/python$_py"

2
clucene/PKGBUILD
View File

@ -5,7 +5,7 @@
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=clucene
pkgver=2.3.3.4
pkgrel=11
pkgrel=12
pkgdesc="C++ port of the high-performance text search engine Lucene"
arch=(x86_64 powerpc64le)
url="http://clucene.sourceforge.net/"

4
cmake/PKGBUILD
View File

@ -4,7 +4,7 @@
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=cmake
pkgver=3.18.4
pkgver=3.19.2
pkgrel=1
pkgdesc='A cross-platform open-source make system'
arch=( x86_64 powerpc64le powerpc )
@ -15,7 +15,7 @@ makedepends=('qt5-base' 'python-sphinx' 'emacs')
optdepends=('qt5-base: cmake-gui')
source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
cmake-cppflags.patch)
sha512sums=('2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9'
sha512sums=('d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a'
'407c5c63a31266e44641ada8229dbc33df44df98e5bb575db3a33590e8ffdff9aea3f2ee5cb0cb855858facf1e46c63886dea9f948a0cad2da042e7f7f258cac')
prepare() {

10
colord/PKGBUILD
View File

@ -1,11 +1,11 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgbase=colord
pkgname=(colord colord-sane)
pkgver=1.4.4+9+g1ce26da
pkgrel=2
pkgver=1.4.5
pkgrel=1
pkgdesc="System daemon for managing color devices"
url="https://www.freedesktop.org/software/colord"
arch=( x86_64 powerpc64le powerpc )
@ -14,7 +14,7 @@ depends=(lcms2 libgusb polkit sqlite dconf dbus libgudev shared-mime-info system
makedepends=(gobject-introspection vala sane bash-completion argyllcms git meson gtk-doc systemd
docbook-xsl)
options=(!emptydirs)
_commit=1ce26daa5bc786869dac6ba309b698480ef31bac # master
_commit=0563117371f82420616e5e40b6a75a0b34c697c7 # tags/1.4.5^0
source=("git+https://github.com/hughsie/colord#commit=$_commit")
sha256sums=('SKIP')
validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17') # Richard Hughes
@ -35,7 +35,7 @@ build() {
-D vapi=true \
-D print_profiles=true \
-D daemon_user=colord
ninja -C build
meson compile -C build
}
check() {

8
confuse/PKGBUILD
View File

@ -7,13 +7,14 @@
pkgname=confuse
pkgver=3.3
pkgrel=1
pkgrel=2
pkgdesc='C-library for parsing configuration files'
arch=( x86_64 powerpc64le powerpc )
url='https://github.com/martinh/libconfuse'
license=('LGPL')
url='https://github.com/libconfuse/libconfuse'
license=('ISC')
depends=('glibc')
source=("https://github.com/martinh/libconfuse/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
source=("https://github.com/libconfuse/libconfuse/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
options=('!emptydirs')
sha256sums=('3a59ded20bc652eaa8e6261ab46f7e483bc13dad79263c15af42ecbb329707b8')
@ -31,4 +32,5 @@ check() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -D -m 644 -t "${pkgdir}/usr/share/licenses/${pkgname}/" LICENSE
}

60
consul/PKGBUILD
View File

@ -3,31 +3,29 @@
# Maintainer: Felix Yan <felixonmars@archlinux.org>
pkgname=consul
pkgver=1.7.4
pkgver=1.9.1
pkgrel=1
pkgdesc="A tool for service discovery, monitoring and configuration."
arch=(powerpc64le)
arch=(x86_64 powerpc64le)
url="https://www.consul.io"
license=('MPL2')
depends=('glibc')
makedepends=('git' 'go' 'go-bindata-assetfs' 'go-bindata-hashicorp' 'procps-ng' 'zip' 'yarn' 'bower' 'nodejs-lts-dubnium' 'npm' 'zip' 'gox' 'go-tools')
makedepends=('git' 'go' 'go-bindata-assetfs' 'go-bindata-hashicorp' 'procps-ng' 'zip' 'yarn' 'bower' 'nodejs' 'npm' 'zip' 'gox' 'go-tools')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hashicorp/consul/archive/v${pkgver}.tar.gz"
'consul.service'
'consul.default'
'consul.sysusers'
'example.json'
'fix-build-version-info.patch'
'unparallelize-or-disable-flaky-tests.patch'
# 'fix-build-version-info.patch'
# 'unparallelize-or-disable-flaky-tests.patch'
)
install=consul.install
backup=('etc/default/consul')
sha512sums=('50466c6ded9d46ade57df252cda3cfc24ff321c13455d789dc7ea300ba037386aca73c6a47be9c5817985ff9678e04daa3295aff5ae83c97afa297451456bc4b'
sha512sums=('9b983fed98499f642ac1bd8d183c2d76cbe321b8d1f7d318257c392185654e4037f7d80d39935011c0d97eb45c6686bd7c34c08908d5ad23d2c99bcee5e1fa74'
'c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04'
'ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079'
'ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87'
'c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348'
'c6e06dbf5954277ba472ba5bbaf0da5b9a22a49b02ef59cc16057025cab65e9065855f191f2910a3051a6877e4a8a9c392a98b811b911cee8c6fa5c39853ce7a'
'b59b2733d598ae6648c198f26f23961d4c1ea8c693a1a5b1c16a0951400c3bb9a9d2d5efe4f0a5cca9ae3b1f225a8eb4133c9011c4125589e936c7dcdc4b2495')
'c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348')
export CGO_LDFLAGS="${LDFLAGS}"
export CGO_CFLAGS="${CFLAGS}"
@ -37,8 +35,16 @@ export CGO_CXXFLAGS="${CXXFLAGS}"
export GOFLAGS="-trimpath -mod=readonly -modcacherw"
export GOOS='linux'
export GOARCH='ppc64le'
export XC_OSARCH='linux/ppc64le'
case "${CARCH}" in
powerpc64le)
export GOARCH='ppc64le'
export XC_OSARCH='linux/ppc64le'
;;
x86_64)
export GOARCH='amd64'
export XC_OSARCH='linux/amd64'
;;
esac
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@ -58,18 +64,26 @@ build() {
go build -o build './...'
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
# prevent e.g. syslog tests
export TRAVIS='true'
# some tests need the built `consul` binary in $PATH
export PATH="${PWD}/build:${PATH}"
# weird race conditions when being run overparallelized
go test -v -p 2 -parallel 2 './...'
}
##############################################################################
####
#### test suite is currently broken and fails horribly
#### upstream is not interested in helping to debug failures downstream
####
#### therefore the testsuite is disabled for the time being
####
##############################################################################
# check() {
# cd "${srcdir}/${pkgname}-${pkgver}"
#
# # prevent e.g. syslog tests
# export TRAVIS='true'
#
# # some tests need the built `consul` binary in $PATH
# export PATH="${PWD}/build:${PATH}"
#
# # weird race conditions when being run overparallelized
# go test -v -p 2 -parallel 2 './...'
# }
package() {
cd "${srcdir}/${pkgname}-${pkgver}"

BIN
cross-compilers/powerpc-linux-gnu-gcc-stage2/gcc-8.2.1-20181127.tar.xz.sig
View File

Binary file not shown.

BIN
cross-compilers/powerpc-linux-gnu-gcc-stage2/isl-0.20.tar.bz2
View File

Binary file not shown.

BIN
cross-compilers/powerpc-linux-gnu-gcc/gcc-8.2.1-20181127.tar.xz.sig
View File

Binary file not shown.

BIN
cross-compilers/powerpc-linux-gnu-gcc/isl-0.20.tar.bz2
View File

Binary file not shown.

8
cross-compilers/powerpc64-linux-gnu-binutils/PKGBUILD
View File

@ -9,7 +9,7 @@
_target="powerpc64-linux-gnu"
pkgname=${_target}-binutils
pkgver=2.34
pkgver=2.35.1
pkgrel=1
pkgdesc="A set of programs to assemble and manipulate binary and object files (${_target})"
arch=(x86_64 powerpc64le)
@ -20,8 +20,8 @@ checkdepends=(dejagnu bc)
options=(staticlibs !distcc !ccache)
source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig})
validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
md5sums=('664ec3a2df7805ed3464639aaae332d6'
'SKIP')
sha256sums=('3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607'
'SKIP')
prepare() {
mkdir -p binutils-build
@ -80,4 +80,6 @@ package() {
rm -f "$pkgdir/usr/bin/"{ar,as,ld,nm,objdump,ranlib,readelf,strip,objcopy}
rm -rf ${pkgdir}/usr/lib/ldscripts
rm -rfv ${pkgdir}/usr/lib/libctf*
rm -rfv ${pkgdir}/usr/include/ctf*
}

8
cross-compilers/powerpc64-linux-gnu-gcc-stage1/PKGBUILD
View File

@ -8,7 +8,7 @@
_target="powerpc64-linux-gnu"
pkgname=${_target}-gcc-stage1
pkgver=9.2.0
pkgver=10.2.0
_majorver=${pkgver:0:1}
_islver=0.21
pkgrel=1
@ -24,14 +24,10 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.
86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com
13975A70E63C361C73AE69EF6EEB81F8981C74C7 # richard.guenther@gmail.com
33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
sha256sums=('ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206'
sha256sums=('b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c'
'SKIP'
'd18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859')
_svnrev=259195
_svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
_libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
prepare() {
[[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
cd gcc

8
cross-compilers/powerpc64-linux-gnu-gcc-stage2/PKGBUILD
View File

@ -8,7 +8,7 @@
_target="powerpc64-linux-gnu"
pkgname=${_target}-gcc-stage2
pkgver=9.1.0
pkgver=10.2.0
_majorver=${pkgver:0:1}
_islver=0.21
pkgrel=1
@ -27,14 +27,10 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.
86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com
13975A70E63C361C73AE69EF6EEB81F8981C74C7 # richard.guenther@gmail.com
33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
sha256sums=('79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0'
sha256sums=('b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c'
'SKIP'
'd18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859')
_svnrev=259195
_svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
_libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
prepare() {
[[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
cd gcc

BIN
cross-compilers/powerpc64-linux-gnu-gcc-stage2/gcc-8.2.1-20181127.tar.xz.sig
View File

Binary file not shown.

BIN
cross-compilers/powerpc64-linux-gnu-gcc-stage2/isl-0.20.tar.bz2
View File

Binary file not shown.

6
cross-compilers/powerpc64-linux-gnu-gcc/PKGBUILD
View File

@ -8,7 +8,7 @@
_target="powerpc64-linux-gnu"
pkgname="${_target}-gcc"
pkgver=9.1.0
pkgver=10.2.0
_majorver=${pkgver:0:1}
_islver=0.21
pkgrel=1
@ -16,7 +16,7 @@ pkgdesc="The GNU Compiler Collection (${_target})"
arch=(x86_64 powerpc64le)
license=(GPL LGPL FDL custom)
url='http://gcc.gnu.org'
depends=("${_target}-binutils>=2.32-1" "${_target}-glibc>=2.29-1" libmpc elfutils zlib)
depends=("${_target}-binutils>=2.35.1-1" "${_target}-glibc>=2.32-1" libmpc elfutils zlib)
checkdepends=(dejagnu inetutils)
options=(!emptydirs !distcc !strip)
conflicts=("${_target}-gcc-stage1" "${_target}-gcc-stage2")
@ -28,7 +28,7 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.
86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com
13975A70E63C361C73AE69EF6EEB81F8981C74C7 # richard.guenther@gmail.com
33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
sha256sums=('79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0'
sha256sums=('b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c'
'SKIP'
'd18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859')

BIN
cross-compilers/powerpc64-linux-gnu-gcc/gcc-8.2.1-20181127.tar.xz.sig
View File

Binary file not shown.

BIN
cross-compilers/powerpc64-linux-gnu-gcc/isl-0.20.tar.bz2
View File

Binary file not shown.

12
cross-compilers/powerpc64-linux-gnu-glibc-headers/PKGBUILD
View File

@ -8,23 +8,23 @@
_target="powerpc64-linux-gnu"
pkgname=${_target}-glibc-headers
pkgver=2.31
pkgver=2.32
pkgrel=1
pkgdesc="GNU C Library headers (${_target})"
arch=('any')
url="http://www.gnu.org/software/libc/"
license=(GPL LGPL)
depends=("${_target}-linux-api-headers>=5.2.8-1")
makedepends=("${_target}-gcc-stage1>=9.1.0")
depends=("${_target}-linux-api-headers>=5.9")
makedepends=("${_target}-gcc-stage1>=10.2.0")
options=(!buildflags !strip staticlibs)
_commit=5a74abda201907cafbdabd1debf98890313ff71e
source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
bz20338.patch
0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch)
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
md5sums=('SKIP'
'dc0d3ad59aeaaf591b085a77de6e03e9'
'58ffe75a9c5a1b22c535a5c2e725db22')
sha256sums=('SKIP'
'959d4f41edd004bddd9091c4d8c8c3aa07d79a04bfdb89d59f9f26fe5a74d32a'
'6494b41528d10e3668f33f6852a16866b423a6a0163326e6e16d9cdec706a664')
prepare() {
mkdir -p glibc-build

14
cross-compilers/powerpc64-linux-gnu-glibc/PKGBUILD
View File

@ -8,14 +8,14 @@
_target="powerpc64-linux-gnu"
pkgname=${_target}-glibc
pkgver=2.29
pkgver=2.32
pkgrel=1
pkgdesc="GNU C Library (${_target})"
arch=('any')
url="http://www.gnu.org/software/libc/"
license=(GPL LGPL)
depends=("${_target}-linux-api-headers>=5.2.8-1")
makedepends=("${_target}-gcc-stage1>=9.1.0")
depends=("${_target}-linux-api-headers>=5.9")
makedepends=("${_target}-gcc-stage1>=10.2.0")
provides=("${_target}-glibc-headers=${pkgver}" "${_target}-eglibc")
conflicts=("${_target}-glibc-headers" "${_target}-eglibc")
replaces=("${_target}-glibc-headers")
@ -26,10 +26,10 @@ source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch
powerpc-hack.patch)
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
md5sums=('SKIP'
'dc0d3ad59aeaaf591b085a77de6e03e9'
'af5d3c5227ac639effe39667a43879a1'
'a9b17e09ef60bf70df313c7baad64789')
sha256sums=('SKIP'
'959d4f41edd004bddd9091c4d8c8c3aa07d79a04bfdb89d59f9f26fe5a74d32a'
'0761f152bca433aec085ff44a05ce2edb9fdd16e2261580dc41be8bdf9f1252a'
'4cc2f747dedf4040c8e27ff4a82b32b5a0692bfeda58ccbf4def66945d8edcbd')
prepare() {
mkdir -p glibc-build

2
cross-compilers/powerpc64-linux-gnu-glibc/powerpc-hack.patch
View File

@ -5,7 +5,7 @@
OBJDUMP=`$CC -print-prog-name=objdump`
-OBJCOPY=`$CC -print-prog-name=objcopy`
+OBJCOPY=`$CC -print-prog-name=powerpc64le-linux-gnu-objcopy`
+OBJCOPY=`$CC -print-prog-name=powerpc64-linux-gnu-objcopy`
GPROF=`$CC -print-prog-name=gprof`

4
cross-compilers/powerpc64-linux-gnu-linux-api-headers/PKGBUILD
View File

@ -9,7 +9,7 @@
_target_arch=powerpc64
_target=${_target_arch}-linux-gnu
pkgname=${_target}-linux-api-headers
pkgver=5.3.1
pkgver=5.9.14
pkgrel=1
pkgdesc="Kernel headers sanitized for use in userspace (${_target})"
arch=(any)
@ -17,7 +17,7 @@ url='http://www.gnu.org/software/libc'
license=(GPL2)
makedepends=(rsync make)
source=(https://www.kernel.org/pub/linux/kernel/v5.x/linux-${pkgver}.tar.xz)
md5sums=('4c68633ce304b8fbc7be2d3452060c11')
sha256sums=('39fcfb41dcdf71b6b42b88eff3d8cedbe7523830ccae847f3914c0b97e1e6b49')
validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman

16
cross-compilers/powerpc64le-linux-gnu-binutils/binutils-2.31.1.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbTvUGAAoJEBP874ndnjxPRDUQANv6+TbBuNhYbL5SwgGEwy4Q
ZWrx7X8EcyDR8deddSgcgt92E1MPgXiaq+0xaxb8TZ8VvXk0aPWSFmNrLA3CBBWx
WIzUGBbso70traROtCiWbamoRnIE04aM+6X5zmnIvrzKEPvYhAMPMr3yzqhSLgjE
8iiIzWaocW2j+pgU0ogNGJuj9eGtHQhb7oQF3Ad0aO8B4O5+7e0ABgCV2x+s5mwB
FqUV2in6F9djdFEtCp52DKkK5qu1cT3GCUGfSOWzNv+43z8+PPCeW5c0Hl08HbVg
OyGmAOkCtdHRNpjQYTRhonU9xcgt1gsb5Ry8jakX9lzfMknUYNiRAmNxkPqoNAsy
R8py34RC7BQjTM0s9SMxFBg2+ZurGa2uc90ngLOpKsWrtqWJ8NJ/rcxfgjmnOhfZ
joyyN5ejAcqiTZUwHZlIFS57Xk70yS+/lkKgBs+SD+deGdajXulb1gR6X3f6Azfh
um0oq5EqEKGK9R4LXKs90H9iYgyBJWCO1QcfbNT2hR181oHu3tdK93Y6KwfvUcDw
/s6lmtDJjczRy0U5LI4w/d/rfJQdvFV6nJhqshQhaVg5A+TJ8sAQcHYfaAcSt33y
OCx0N8rMFRdIY2MUIxvrkTAb+TrVdPNa4yDhyRsZXaJN7o6JnvqDPOtXE7ZWhX4e
SI5Se9Pa+27p2vyyksnb
=afsT
-----END PGP SIGNATURE-----

BIN
cross-compilers/powerpc64le-linux-gnu-gcc-stage2/gcc-8.2.1-20181127.tar.xz.sig
View File

Binary file not shown.

BIN
cross-compilers/powerpc64le-linux-gnu-gcc-stage2/isl-0.20.tar.bz2
View File

Binary file not shown.

BIN
cross-compilers/powerpc64le-linux-gnu-gcc/gcc-8.2.1-20181127.tar.xz.sig
View File

Binary file not shown.

BIN
cross-compilers/powerpc64le-linux-gnu-gcc/isl-0.20.tar.bz2
View File

Binary file not shown.

16
cross-compilers/x86-64-linux-gnu-binutils/binutils-2.31.1.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbTvUGAAoJEBP874ndnjxPRDUQANv6+TbBuNhYbL5SwgGEwy4Q
ZWrx7X8EcyDR8deddSgcgt92E1MPgXiaq+0xaxb8TZ8VvXk0aPWSFmNrLA3CBBWx
WIzUGBbso70traROtCiWbamoRnIE04aM+6X5zmnIvrzKEPvYhAMPMr3yzqhSLgjE
8iiIzWaocW2j+pgU0ogNGJuj9eGtHQhb7oQF3Ad0aO8B4O5+7e0ABgCV2x+s5mwB
FqUV2in6F9djdFEtCp52DKkK5qu1cT3GCUGfSOWzNv+43z8+PPCeW5c0Hl08HbVg
OyGmAOkCtdHRNpjQYTRhonU9xcgt1gsb5Ry8jakX9lzfMknUYNiRAmNxkPqoNAsy
R8py34RC7BQjTM0s9SMxFBg2+ZurGa2uc90ngLOpKsWrtqWJ8NJ/rcxfgjmnOhfZ
joyyN5ejAcqiTZUwHZlIFS57Xk70yS+/lkKgBs+SD+deGdajXulb1gR6X3f6Azfh
um0oq5EqEKGK9R4LXKs90H9iYgyBJWCO1QcfbNT2hR181oHu3tdK93Y6KwfvUcDw
/s6lmtDJjczRy0U5LI4w/d/rfJQdvFV6nJhqshQhaVg5A+TJ8sAQcHYfaAcSt33y
OCx0N8rMFRdIY2MUIxvrkTAb+TrVdPNa4yDhyRsZXaJN7o6JnvqDPOtXE7ZWhX4e
SI5Se9Pa+27p2vyyksnb
=afsT
-----END PGP SIGNATURE-----

7
cups-filters/PKGBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=cups-filters
pkgver=1.28.5
pkgver=1.28.6
pkgrel=1
pkgdesc="OpenPrinting CUPS Filters"
arch=(x86_64 powerpc64le)
@ -18,7 +18,7 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
'docx2txt: to convert Microsoft OOXML text from DOCX files')
backup=(etc/cups/cups-browsed.conf)
source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
sha256sums=('a8425fc7bcbf50794264ab30239003936f88c38a2d6bf08e1eb14bc8c928f60f')
sha256sums=('756b433cac3718e492d1da58859461862ec70bd863dbd2d4d221ab724f145f6c')
build() {
cd "$pkgname"-$pkgver
@ -31,6 +31,7 @@ build() {
--with-browseremoteprotocols=DNSSD,CUPS \
--enable-auto-setup-driverless \
--with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
@ -46,7 +47,7 @@ package() {
# add upstream systemd support file
install -Dm644 utils/cups-browsed.service "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
sed -i "s|cups.service|org.cups.cupsd.service|g" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
#sed -i "s|cups.service|org.cups.cupsd.service|g" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
# use cups group from cups pkg FS#56818
chgrp -R 209 "${pkgdir}"/etc/cups

51
cups/PKGBUILD
View File

@ -3,15 +3,21 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=2.3.3
pkgrel=3
#_commit=be75d5d99a54c5f62608f7b9e98748d4c7045ec1 # master 2020-11-27
pkgver=2.3.3op1
pkgrel=1
epoch=1
arch=(x86_64 powerpc64le powerpc)
license=('Apache' 'custom')
url="https://www.cups.org/"
#url="https://www.cups.org/"
url="https://github.com/OpenPrinting/cups"
makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls'
'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
'hicolor-icon-theme' 'systemd' 'libxcrypt' 'inetutils' 'libpaper' 'valgrind')
source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
'avahi' 'hicolor-icon-theme' 'systemd' 'libxcrypt' 'inetutils' 'libpaper' 'valgrind'
'git')
source=(#https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
#"git+https://github.com/OpenPrinting/cups#commit=$_commit"
cups.logrotate
cups.pam
cups.sysusers
@ -19,21 +25,27 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
cups-no-export-ssllibs.patch
cups-1.6.2-statedir.patch
# bugfixes
cups-systemd-socket.patch
cups-freebind.patch
guid.patch)
sha256sums=('261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee'
sha256sums=('5cf7988081d9003f589ba173b37bc2bbf81db43bb94e5e7d3e7d4c0afb0f9bc2'
'SKIP'
'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
'23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
'3d8e24fd340fecef7101672d342433365cf78130b7182ecfd03071e31e894a9b'
'3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d'
'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security@cups.org>
validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <security@cups.org>"
validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet <michael.r.sweet@gmail.com>"
#pkgver() {
# cd $pkgbase
# git describe --tags | sed 's/-/+/g' | sed 's/v//'
#}
prepare() {
cd "${pkgbase}"-${pkgver}
@ -45,17 +57,14 @@ prepare() {
patch -Np1 -i "${srcdir}"/cups-1.6.2-statedir.patch
# bug fixes
# make sure network is up when starting and notify systemd - FC
patch -Np1 -i "${srcdir}"/cups-systemd-socket.patch
# https://github.com/OpenPrinting/cups/issues/53
# use IP_FREEBIND, because cupsd cannot bind to not yet existing IP address
patch -Np1 -i "${srcdir}"/cups-freebind.patch
# FS#56818 - https://github.com/apple/cups/issues/5236
patch -Np1 -i "${srcdir}"/guid.patch
# set MaxLogSize to 0 to prevent using cups internal log rotation
sed -i -e '5i\ ' conf/cupsd.conf.in
sed -i -e '6i# Disable cups internal logging - use logrotate instead' conf/cupsd.conf.in
sed -i -e '7iMaxLogSize 0' conf/cupsd.conf.in
# Rebuild configure script for not zipping man-pages.
aclocal -I config-scripts
autoconf -I config-scripts
@ -64,6 +73,9 @@ prepare() {
build() {
cd "${pkgbase}"-${pkgver}
# The build system uses only DSOFLAGS but not LDFLAGS to build some libraries.
export DSOFLAGS=${LDFLAGS}
# use fixed cups user (id 209) since systemd adds "lp" group without a fixed id
CC=gcc CXX=g++ \
./configure --prefix=/usr \
@ -76,6 +88,7 @@ build() {
--with-exe-file-perm=0755 \
--with-cups-user=209 \
--with-cups-group=209 \
--with-max-log-size=0 \
--enable-pam=yes \
--enable-raw-printing \
--enable-dbus=yes \
@ -91,7 +104,8 @@ build() {
check() {
cd "${pkgbase}"-${pkgver}
#make -k check || /bin/true
# make -k check || /bin/true
# make check
}
package_libcups() {
@ -103,6 +117,7 @@ depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'libusb' 'libxcrypt')
# put this into the libs pkg to make other software find the libs(no pkg-config file included)
mkdir -p "${pkgdir}"/usr/bin
install -m755 "${srcdir}"/"${pkgbase}"-${pkgver}/cups-config "${pkgdir}"/usr/bin/cups-config
# install -m755 "${srcdir}"/"${pkgbase}"/cups-config "${pkgdir}"/usr/bin/cups-config
# add license + exception
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" {LICENSE,NOTICE}
@ -167,7 +182,7 @@ optdepends=('ipp-usb: allows to send HTTP requests via a USB connection on devic
# remove client.conf man page
rm -f "${pkgdir}"/usr/share/man/man5/client.conf.5
# comment out all conversion rules which use any of the removed filters that are now part of cups-filters
# comment out removed filters that are now part of cups-filters
perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' "$pkgdir"/usr/share/cups/mime/mime.convs
# comment out unnecessary PageLogFormat entry

15
cups/cups-freebind.patch Normal file
View File

@ -0,0 +1,15 @@
diff -up cups-2.0.2/cups/http-addr.c.freebind cups-2.0.2/cups/http-addr.c
--- cups-2.0.2/cups/http-addr.c.freebind 2015-02-10 14:46:33.000000000 +0100
+++ cups-2.0.2/cups/http-addr.c 2015-02-10 14:50:35.074759141 +0100
@@ -186,6 +186,10 @@ httpAddrListen(http_addr_t *addr, /* I -
val = 1;
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, CUPS_SOCAST &val, sizeof(val));
+#ifdef __linux
+ setsockopt(fd, IPPROTO_IP, IP_FREEBIND, CUPS_SOCAST &val, sizeof(val));
+#endif /* __linux */
+
#ifdef IPV6_V6ONLY
if (addr->addr.sa_family == AF_INET6)
setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, CUPS_SOCAST &val, sizeof(val));
diff -up cups-2.0.2/scheduler/listen.c.freebind cups-2.0.2/scheduler/listen.c

12
cups/cups-systemd-socket.patch
View File

@ -19,20 +19,22 @@ diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
--- cups-2.3.0/scheduler/org.cups.cupsd.service.in 2019-08-23 17:19:38.000000000 +0200
+++ cups-2.3.0/scheduler/org.cups.cupsd.service.in.new 2019-08-25 20:20:25.805339727 +0200
@@ -1,11 +1,12 @@
--- cups-2.3.0/scheduler/cups.service.in 2019-08-23 17:19:38.000000000 +0200
+++ cups-2.3.0/scheduler/cups.service.in.new 2019-08-25 20:20:25.805339727 +0200
@@ -1,12 +1,13 @@
[Unit]
Description=CUPS Scheduler
Documentation=man:cupsd(8)
-After=sssd.service
+After=sssd.service network-online.target
Requires=cups.socket
+Wants=network-online.target
[Service]
ExecStart=@sbindir@/cupsd -l
-Type=simple
+Type=notify
Restart=on-failure
[Install]

10
cups/cups.install
View File

@ -16,5 +16,13 @@ post_upgrade() {
echo "make sure /etc/cups and all files within are owned by"
echo "cups group - run \"chgrp -R cups /etc/cups\"."
fi
}
# upstream reverted back to common old naming scheme
if [[ $(vercmp 2.3.3+105+g59137acc1-1 $2) = 1 ]]; then
echo ">>> Cups systemd socket and service files have been"
echo ">>> renamed by upstream decision. Please make sure"
echo ">>> to disable/reenable the services to your need."
echo ">>> hint: \"pacman -Ql cups | grep systemd\" and"
echo ">>> \"ls -lR /etc/systemd/ | grep cups\" "
fi
}

4
dbus-broker/PKGBUILD
View File

@ -3,7 +3,7 @@
# Contributor: David Herrmann <dh.herrmann@gmail.com>
pkgname=dbus-broker
pkgver=24
pkgver=25
pkgrel=1
pkgdesc="Linux D-Bus Message Broker"
url="https://github.com/bus1/dbus-broker/wiki"
@ -11,7 +11,7 @@ arch=(x86_64 powerpc64le powerpc)
license=(Apache)
depends=(systemd-libs expat audit)
makedepends=(git meson systemd python-docutils)
_commit=3c652e4cbcc054533a0c8755463263a79d546332 # tags/v24^0
_commit=c6345f7d48a59f25700b6d8766698b544f6572ad # tags/v25^0
source=("git+https://github.com/bus1/dbus-broker#commit=$_commit"
git+https://github.com/c-util/c-{rbtree,list,dvar,utf8,shquote,ini,stdaux})
sha256sums=('SKIP'

4
deluge/PKGBUILD
View File

@ -6,7 +6,7 @@
pkgbase=deluge
pkgname=(deluge deluge-gtk)
pkgver=2.0.4.dev38+g23a48dd01
pkgrel=2
pkgrel=3
pkgdesc="BitTorrent client with multiple user interfaces in a client/server model"
url="https://deluge-torrent.org/"
arch=(any)
@ -94,7 +94,7 @@ package_deluge() {
_pick gtk usr/bin/deluge-gtk usr/share/man/man1/deluge-gtk.1
_pick gtk usr/share/{appdata,applications,icons,pixmaps}
_pick gtk usr/lib/python3.8/site-packages/deluge/ui/gtk3
_pick gtk usr/lib/python3.9/site-packages/deluge/ui/gtk3
}
package_deluge-gtk() {

10
dhcpcd/0001-dhcpcd-termios.patch Normal file
View File

@ -0,0 +1,10 @@
--- dhcpcd-9.3.3/src/privsep-linux.c.orig 2020-11-25 14:09:49.461650149 +0100
+++ dhcpcd-9.3.3/src/privsep-linux.c 2020-11-25 14:10:06.575850233 +0100
@@ -42,6 +42,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <termios.h>
#include "common.h"
#include "if.h"

20
dhcpcd/PKGBUILD
View File

@ -5,7 +5,7 @@
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
pkgver=9.3.1
pkgver=9.3.4
pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
url="https://roy.marples.name/projects/dhcpcd/"
@ -22,17 +22,21 @@ source=("https://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.xz"
dhcpcd_.service
dhcpcd.service
dhcpcd.sysusers
dhcpcd.tmpfiles)
dhcpcd.tmpfiles
0001-dhcpcd-termios.patch)
validpgpkeys=('A785ED2755955D9E93EA59F6597F97EA9AD45549') # Roy Marples (NetBSD) <roy@NetBSD.org>
sha256sums=('a0843233fdaecee971c38ceda53ad1450bb7b83aefbf1fa9642213224a9c415e'
'8ff069a78f0b7e323fced311d653bc1d5dfb68dfc17f996c45cb4a7ee692ca69'
sha256sums=('5c823a0b981b52e7e0fd3183ae220422d6fcc3aa511af31dcb1a7ee6cb0f1c39'
'd40d51367fcf7e9596e42cd2bab59404633bedbab4d0a3183e7246b4677937b7'
'37acd53a589711f5e1db2fcaebb4ccf1c90dc4bcd309626bde25beb7b630a545'
'20bccbf8a05b1bc2be365c8b4b526c38c752f48229ba53c3be113ac5b634f210'
'06788ad9f5f7ccb5d2a2da6f0322ff5771f8de82cfbe8b9ad954f2c38265e21b'
'55d57b958f6b7e4d4a538ee88b0fcc1a522050c2d38efb5d680139f618234b35')
# prepare () {
# cd ${pkgname}-${pkgver}
# }
'55d57b958f6b7e4d4a538ee88b0fcc1a522050c2d38efb5d680139f618234b35'
'2a3e0dcb024e6e016cf84e1f5ef282a4c83d5b71f0902a99991f7e1a83d99260')
prepare () {
cd ${pkgname}-${pkgver}
patch -Np1 -i ${srcdir}/0001-dhcpcd-termios.patch
}
build() {
cd ${pkgname}-${pkgver}

2
dhcpcd/dhcpcd.install
View File

@ -1,5 +1,5 @@
pre_upgrade() {
if [ "$1" = "9.3.1-1" -a "$2" = "9.2.0-1" ]; then
if [ -d /var/lib/dhcpcd ]; then
# match permissions with upstream
chown root:root /var/lib/dhcpcd
chmod 0750 /var/lib/dhcpcd

8
dialog/PKGBUILD
View File

@ -5,7 +5,7 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=dialog
pkgver=1.3_20200327
pkgver=1.3_20201126
pkgrel=1
epoch=1
pkgdesc="A tool to display dialog boxes from shell scripts"
@ -14,8 +14,10 @@ url="https://invisible-island.net/dialog/"
license=('LGPL2.1')
depends=('sh' 'ncurses')
provides=('libdialog.so')
source=(https://invisible-mirror.net/archives/$pkgname/$pkgname-${pkgver/_/-}.tgz)
sha256sums=('466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99')
source=(https://invisible-mirror.net/archives/$pkgname/$pkgname-${pkgver/_/-}.tgz{,.asc})
sha256sums=('c9233a6c8ea33a59e2378e5146ae2bd13b519744cfdb647af7420adac5ad3866'
'SKIP')
validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # Thomas Dickey <dickey@invisible-island.net>
build() {
cd "$srcdir/$pkgname-${pkgver/_/-}"

2
distcc/PKGBUILD
View File

@ -7,7 +7,7 @@
pkgname=distcc
pkgver=3.3.3
pkgrel=6
pkgrel=7
pkgdesc='Distributed compilation service for C, C++ and Objective-C'
arch=(x86_64 powerpc64le)
url='https://github.com/distcc/distcc'

2
dkms/PKGBUILD
View File

@ -3,7 +3,7 @@
# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com)
pkgname=dkms
pkgver=2.8.3
pkgver=2.8.4
pkgrel=1
pkgdesc='Dynamic Kernel Modules System'
arch=('any')

2
dotnet/lttng-ust/PKGBUILD
View File

@ -6,7 +6,7 @@
pkgbase='lttng-ust'
pkgname=('lttng-ust' 'python-lttngust')
pkgver=2.12.0
pkgrel=1
pkgrel=2
arch=(x86_64 powerpc64le)
url="https://lttng.org/"
license=('LGPL2.1' 'GPL2' 'MIT')

Some files were not shown because too many files have changed in this diff Show More