Commit 4076d288 authored by Trung Lê's avatar Trung Lê

Merge branch 'master' of https://gitlab.alpinelinux.org/alpine/aports into conntrack-tools-k8s

parents e2aadff1 3a45b931
Pipeline #25082 passed with stages
in 12 minutes and 30 seconds
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=alpine
pkgver=2.22.1
pkgver=2.23
pkgrel=0
pkgdesc="Text-based email client, friendly for novices but powerful"
url="http://alpine.x10host.com/alpine/"
......@@ -8,7 +8,7 @@ arch="all"
license="Apache-2.0"
makedepends="openldap-dev heimdal-dev ncurses-dev openssl-dev"
subpackages="$pkgname-dbg $pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://repo.or.cz/alpine.git/snapshot/v$pkgver.tar.gz
source="http://alpine.x10host.com/alpine/release/src/alpine-$pkgver.tar.xz"
0001-ssl_unix-fix-server-name-validation.patch
"
builddir="$srcdir/alpine-v$pkgver-3782328"
......@@ -30,5 +30,5 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="321b547008d98b78b17e437f27cb4072b32e31da7560dfe8647c9b0ce4ca2393785df60d11467d7009236e3af5ed086b756fb5ba5b4864740cbedc260cfc3540 alpine-2.22.1.tar.gz
sha512sums="abc3675b18d6bd20a547b8e2c3f1f4c668aee2f2d20f426f28b4b3d4cfd66762777007441da3b0fda74e625c71bc2ef05434089508c2af804e62cf216df5554b alpine-2.23.tar.xz
5e10289f292139bf576e40bda0f3539d62024309650473a2fdbb281e5d7691cc4c1d3d21f78615e2c900766eddba076f512d92f60d4fbb61e1683f35cba185aa 0001-ssl_unix-fix-server-name-validation.patch"
# Maintainer: Adam Jensen <acjensen@gmail.com>
pkgname=bcc
pkgver=0.15.0
pkgrel=0
pkgrel=1
pkgdesc="A toolkit for creating efficient kernel tracing and manipulation programs"
url="https://github.com/iovisor/bcc/"
arch="all !s390x !mips !mips64" # build fails
......@@ -59,6 +59,8 @@ _tools() {
mkdir -p "$subpkgdir"/usr/share/bcc
mv "$pkgdir"/usr/share/bcc/tools "$subpkgdir"/usr/share/bcc
mv "$pkgdir"/usr/share/bcc/introspection "$subpkgdir"/usr/share/bcc
find "$subpkgdir"/usr/share/bcc/tools -type f -exec \
sed -ie "s/^#!\/usr\/bin\/python$/#!\/usr\/bin\/python3/" \{\} \;
}
_py() {
......
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=ccid
pkgver=1.4.32
pkgver=1.4.33
pkgrel=0
pkgdesc="USB CCID/ICCD SmartCard reader driver"
url="https://ccid.apdu.fr/"
......@@ -30,4 +30,4 @@ package() {
cp src/92_pcscd_ccid.rules "$pkgdir"/usr/lib/udev/rules.d/
}
sha512sums="80fc3bac547ee7c37ff0e72cc650d0a5e1102720698bdc1278581ec53ff1407e0e719eb0345775fbc76c0d56d9271dcb07a9ddc98450bba2ff37823f23a8adbf ccid-1.4.32.tar.bz2"
sha512sums="ccfcecbaca4c8f1ee4a4925bd313ced6d6f15ad422cbcc387627aef203a9ae0ff7775c4a2c5d25978ab33ebfd93c34de50e1f783df787b77ea7c774a45ed126b ccid-1.4.33.tar.bz2"
# Contributor: Trevor R.H. Clarke <trevor@notcows.com>
# Maintainer: Trevor R.H. Clarke <trevor@notcows.com>
pkgname=gdal
pkgver=3.1.0
pkgrel=3
pkgver=3.1.1
pkgrel=0
pkgdesc="A translator library for raster and vector geospatial data formats"
url="https://gdal.org/"
arch="all !s390x !x86 !armhf !armv7 !mips !mips64"
......@@ -147,6 +147,6 @@ check() {
apps/ogr2ogr --formats | grep "PostgreSQL -vector- (rw+): PostgreSQL/PostGIS"
}
sha512sums="7c88f3bdf3ceef95b0983a8ace89cad0d247c844596662d303e10393d794ad264f48bcaa777ef64410537a6f6784d58b8564e286725e074f072168a2527c596b gdal-3.1.0.tar.gz
sha512sums="168fea505a24c937c90c502834e2fb0b7efadc09de14674a3f3c71a80ae362b72ae75540492c45906cd331b60de6bab8952d47fbe94347941c47f162fa79d84a gdal-3.1.1.tar.gz
14d080b80a5e499840e7b356acd0a7f6afaec6c65a10d9df864011d89e93310bd3dac22e59ca7c0cd93e6fd2277f85a71920a91ed5afdb352c18e953b2b4783b 10-atoll.patch
4741d6f9f2aaaa80c1ad590073d0b960d4389b8908682de224b476136cc5dd898375ca67498568fac4537a2c23f00e42998618a4a9121ac6d9f82dd61eda15d8 20-userfaultfd-detection.patch"
# Contributor:Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gtksourceview4
pkgver=4.6.0
pkgrel=1
pkgver=4.6.1
pkgrel=0
pkgdesc="A text widget adding syntax highlighting and more to GNOME"
url="https://wiki.gnome.org/Projects/GtkSourceView"
arch="all"
......@@ -36,5 +36,5 @@ check() {
package() {
DESTDIR="$pkgdir" ninja -C output install
}
sha512sums="e7a873dbd452f2077afbc6e0142ce17172a8d33220ea1181e69ed8a5cf94e42e2df741e5a0636731fab6984e84ea2347dca34b5889f3808d29259e13527fa00c gtksourceview-4.6.0.tar.xz
sha512sums="3341e6248a0abba6373a79742b4348d8aff58ca6a4b9093729d0d1fe2579ab8acbc61f1ecc6d350000edae60c963eeca866fa659b3f3d6ec320cdbf1ed21fdec gtksourceview-4.6.1.tar.xz
c765c7c77a94007e95c050c05ef0283b2cdcd5751274924ea08a02ea2507061677d7f286c3e98d6b91f3603a06364d1ea43491e77e2e086e05c841218923e771 skip-test.patch"
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=sshign
pkgver=0.1.0
pkgrel=1
pkgver=0.2.1
pkgrel=0
pkgdesc="Small program to sign & verify files with your SSH key"
url="https://git.sr.ht/~minus/sshign"
arch="all"
license="MIT"
makedepends="go"
makedepends="go scdoc"
source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~minus/sshign/archive/$pkgver.tar.gz"
options="!check" # No upstream tests
subpackages="$pkgname-doc"
build() {
make PREFIX=/usr
......@@ -18,4 +18,8 @@ package() {
make install PREFIX=/usr DESTDIR="$pkgdir"
}
sha512sums="284b56f7420fbf8a0a96fcb8456b28d9ed759320d1b3bc8c06f96211f535817fcc54a7a925807fe845b28e5294a76305fb15f566659eef1e8a2f70e51bb6fe2f sshign-0.1.0.tar.gz"
check() {
go test ./...
}
sha512sums="82b730d870b7319e690ec0ab46f42aa738f94491c0b0637b01421abb6d6f28daf444e453280b6c3e4bc11f10eeaf1ae08edb20713ce32d5abcae71e16e3b41f2 sshign-0.2.1.tar.gz"
# Contributor: Isaac Dunham <ibid.ag@gmail.com>
# Maintainer: Isaac Dunham <ibid.ag@gmail.com>
pkgname=xpdf
pkgver="3.04"
pkgrel=4
pkgver=4.02
pkgrel=0
pkgdesc="The classic X11 PDF viewer"
url="http://www.xpdfreader.com"
url="https://www.xpdfreader.com"
arch="all"
license="GPL-2.0 GPL-3.0"
license="GPL-2.0-or-later OR GPL-3.0-or-later"
depends="ghostscript-fonts"
makedepends="motif-dev freetype-dev libpng-dev"
makedepends="cmake qt5-qtbase-dev"
subpackages="$pkgname-doc"
source="https://xpdfreader-dl.s3.amazonaws.com/old/$pkgname-$pkgver.tar.gz
xpdf-3.04-protection.patch
xpdfrc"
builddir="$srcdir/$pkgname-$pkgver"
source="https://xpdfreader-dl.s3.amazonaws.com/xpdf-$pkgver.tar.gz
permissions.patch"
build() {
cd "$builddir"
./configure \
--with-x \
--with-freetype2-includes=/usr/include/freetype2 \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var
make
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
cmake -B build \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -fPIC" \
-DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -fPIC" \
-DSYSTEM_XPDFRC=/etc/xpdfrc \
$CMAKE_CROSSOPTS
make -C build
}
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
#delete pdf* utils that conflict with poppler-utils.
make -C build DESTDIR="$pkgdir" install
# delete pdf* utils and associated man pages that conflict with
# poppler-utils.
rm -f "$pkgdir"/usr/bin/pdf*
rm -f "$pkgdir"/usr/share/man/man1/pdf*
#install xpdfrc so fonts get picked up
cp "$srcdir"/xpdfrc "$pkgdir"/etc/xpdfrc
# install xpdfrc
install -Dm644 doc/sample-xpdfrc "$pkgdir"/etc/xpdfrc
}
sha512sums="3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf xpdf-3.04.tar.gz
4c6360731ad60ed45e0612b016116a9588f293267ee3e2c1f7cd2f046f045f165334c6e7fceb6b51b3181adb7a74087036a28fcec0e04b23e6374ffc421c1f54 xpdf-3.04-protection.patch
sha512sums="72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc xpdf-4.02.tar.gz
cf56bf9b4ccecc85fd34805454513b921bfe044442dad129178cde6f9ff2fae322bf0d71aaa69b9456aa0f41d639bc3a6aa2c7dcaae177013ac45e92f9fc3125 permissions.patch
7e8404fa5432bad578c29cf3ccd276bb64cd0316b700e40ce606b6b6261c497125e8689c6e545cab2adb04d69b1ed25d1e0d07155add9837e6bb44d5f18d82d3 xpdfrc"
--- a/xpdf/pdfimages.cc
+++ b/xpdf/pdfimages.cc
@@ -4,6 +4,8 @@
//
// Copyright 1998-2003 Glyph & Cog, LLC
//
+// Modified for Debian by Hamish Moffatt, 22 May 2002.
+//
//========================================================================
#include <aconf.h>
@@ -127,12 +129,14 @@ int main(int argc, char *argv[]) {
}
// check for copy permission
+#ifdef ENFORCE_PERMISSIONS
if (!doc->okToCopy()) {
error(errNotAllowed, -1,
"Copying of images from this document is not allowed.");
exitCode = 3;
goto err1;
}
+#endif
// get page range
if (firstPage < 1)
--- a/xpdf/pdftohtml.cc
+++ b/xpdf/pdftohtml.cc
@@ -138,6 +138,7 @@ int main(int argc, char *argv[]) {
goto err1;
}
+#ifdef ENFORCE_PERMISSIONS
// check for copy permission
if (!doc->okToCopy()) {
error(errNotAllowed, -1,
@@ -145,6 +146,7 @@ int main(int argc, char *argv[]) {
exitCode = 3;
goto err1;
}
+#endif
// get page range
if (firstPage < 1) {
--- a/xpdf/pdftops.cc
+++ b/xpdf/pdftops.cc
@@ -4,6 +4,8 @@
//
// Copyright 1996-2003 Glyph & Cog, LLC
//
+// Modified for Debian by Hamish Moffatt, 22 May 2002.
+//
//========================================================================
#include <aconf.h>
@@ -318,12 +320,14 @@ int main(int argc, char *argv[]) {
goto err1;
}
+#ifdef ENFORCE_PERMISSIONS
// check for print permission
if (!doc->okToPrint()) {
error(errNotAllowed, -1, "Printing this document is not allowed.");
exitCode = 3;
goto err1;
}
+#endif
// construct PostScript file name
if (argc == 3) {
--- a/xpdf/pdftotext.cc
+++ b/xpdf/pdftotext.cc
@@ -4,6 +4,8 @@
//
// Copyright 1997-2013 Glyph & Cog, LLC
//
+// Modified for Debian by Hamish Moffatt, 22 May 2002.
+//
//========================================================================
#include <aconf.h>
@@ -209,6 +211,7 @@ int main(int argc, char *argv[]) {
goto err2;
}
+#ifdef ENFORCE_PERMISSIONS
// check for copy permission
if (!doc->okToCopy()) {
error(errNotAllowed, -1,
@@ -216,6 +219,7 @@ int main(int argc, char *argv[]) {
exitCode = 3;
goto err2;
}
+#endif
// construct text file name
if (argc == 3) {
--- a/xpdf-qt/QtPDFCore.cc
+++ b/xpdf-qt/QtPDFCore.cc
@@ -446,9 +446,11 @@ QString QtPDFCore::getSelectedTextQStrin
QString qs;
int i;
+#ifdef ENFORCE_PERMISSIONS
if (!doc->okToCopy()) {
return "";
}
+#endif
if (!(s = getSelectedText())) {
return "";
}
--- a/xpdf-qt/XpdfWidget.cc
+++ b/xpdf-qt/XpdfWidget.cc
@@ -1440,7 +1440,11 @@ bool XpdfWidget::okToExtractText() const
if (!core->getDoc()) {
return false;
}
+#ifdef ENFORCE_PERMISSIONS
return (bool)core->getDoc()->okToCopy();
+#else
+ return true;
+#endif
} catch (GMemException e) {
return false;
}
Port Johannes Bauer's protection patch to 3.04.
This does NOT disable the error messages, since the user should
be aware of the author's intent.
Also, this does not deal with permission to print.
diff --git a/xpdf/PDFCore.cc b/xpdf/PDFCore.cc
index 34b6483..e93fe52 100644
--- a/xpdf/PDFCore.cc
+++ b/xpdf/PDFCore.cc
@@ -1677,9 +1677,6 @@ GString *PDFCore::extractText(int pg, double xMin, double yMin,
int x0, y0, x1, y1, t;
GString *s;
- if (!doc->okToCopy()) {
- return NULL;
- }
if ((page = findPage(pg))) {
cvtUserToDev(pg, xMin, yMin, &x0, &y0);
cvtUserToDev(pg, xMax, yMax, &x1, &y1);
diff --git a/xpdf/XPDFCore.cc b/xpdf/XPDFCore.cc
index 9a3725f..1562c7a 100644
--- a/xpdf/XPDFCore.cc
+++ b/xpdf/XPDFCore.cc
@@ -384,9 +384,8 @@ void XPDFCore::endSelection(int wx, int wy) {
#ifndef NO_TEXT_SELECT
if (selectULX != selectLRX &&
selectULY != selectLRY) {
- if (doc->okToCopy()) {
copySelection();
- } else {
+ if (!doc->okToCopy()) {
error(errNotAllowed, -1,
"Copying of text from this document is not allowed.");
}
@@ -408,9 +407,6 @@ void XPDFCore::copySelection() {
int pg;
double ulx, uly, lrx, lry;
- if (!doc->okToCopy()) {
- return;
- }
if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) {
//~ for multithreading: need a mutex here
if (currentSelection) {
diff --git a/xpdf/pdfimages.cc b/xpdf/pdfimages.cc
index dc79443..9aaa811 100644
--- a/xpdf/pdfimages.cc
+++ b/xpdf/pdfimages.cc
@@ -122,8 +122,6 @@ int main(int argc, char *argv[]) {
if (!doc->okToCopy()) {
error(errNotAllowed, -1,
"Copying of images from this document is not allowed.");
- exitCode = 3;
- goto err1;
}
// get page range
diff --git a/xpdf/pdftohtml.cc b/xpdf/pdftohtml.cc
index f1fe691..824233e 100644
--- a/xpdf/pdftohtml.cc
+++ b/xpdf/pdftohtml.cc
@@ -134,8 +134,6 @@ int main(int argc, char *argv[]) {
if (!doc->okToCopy()) {
error(errNotAllowed, -1,
"Copying of text from this document is not allowed.");
- exitCode = 3;
- goto err1;
}
// get page range
diff --git a/xpdf/pdftotext.cc b/xpdf/pdftotext.cc
index 758413e..e6779fa 100644
--- a/xpdf/pdftotext.cc
+++ b/xpdf/pdftotext.cc
@@ -192,8 +192,6 @@ int main(int argc, char *argv[]) {
if (!doc->okToCopy()) {
error(errNotAllowed, -1,
"Copying of text from this document is not allowed.");
- exitCode = 3;
- goto err2;
}
// construct text file name
#========================================================================
#
# Sample xpdfrc file
#
# The Xpdf tools look for a config file in two places:
# 1. ~/.xpdfrc
# 2. in a system-wide directory, typically /usr/local/etc/xpdfrc
#
# This sample config file demonstrates some of the more common
# configuration options. Everything here is commented out. You
# should edit things (especially the file/directory paths, since
# they'll likely be different on your system), and uncomment whichever
# options you want to use. For complete details on config file syntax
# and available options, please see the xpdfrc(5) man page.
#
# Also, the Xpdf language support packages each include a set of
# options to be added to the xpdfrc file.
#
# http://www.foolabs.com/xpdf/
#
#========================================================================
#----- display fonts
# These map the Base-14 fonts to the Type 1 fonts that ship with
# ghostscript. You'll almost certainly want to use something like
# this, but you'll need to adjust this to point to wherever
# ghostscript is installed on your system. (But if the fonts are
# installed in a "standard" location, xpdf will find them
# automatically.)
fontFile Times-Roman /usr/share/fonts/Type1/n021003l.pfb
fontFile Times-Italic /usr/share/fonts/Type1/n021023l.pfb
fontFile Times-Bold /usr/share/fonts/Type1/n021004l.pfb
fontFile Times-BoldItalic /usr/share/fonts/Type1/n021024l.pfb
fontFile Helvetica /usr/share/fonts/Type1/n019003l.pfb
fontFile Helvetica-Oblique /usr/share/fonts/Type1/n019023l.pfb
fontFile Helvetica-Bold /usr/share/fonts/Type1/n019004l.pfb
fontFile Helvetica-BoldOblique /usr/share/fonts/Type1/n019024l.pfb
fontFile Courier /usr/share/fonts/Type1/n022003l.pfb
fontFile Courier-Oblique /usr/share/fonts/Type1/n022023l.pfb
fontFile Courier-Bold /usr/share/fonts/Type1/n022004l.pfb
fontFile Courier-BoldOblique /usr/share/fonts/Type1/n022024l.pfb
fontFile Symbol /usr/share/fonts/Type1/s050000l.pfb
fontFile ZapfDingbats /usr/share/fonts/Type1/d050000l.pfb
# If you need to display PDF files that refer to non-embedded fonts,
# you should add one or more fontDir options to point to the
# directories containing the font files. Xpdf will only look at .pfa,
# .pfb, .ttf, and .ttc files in those directories (other files will
# simply be ignored).
#fontDir /usr/local/fonts/bakoma
#----- PostScript output control
# Set the default PostScript file or command.
#psFile "|lpr -Pmyprinter"
# Set the default PostScript paper size -- this can be letter, legal,
# A4, or A3. You can also specify a paper size as width and height
# (in points).
psPaperSize letter
#----- text output control
# Choose a text encoding for copy-and-paste and for pdftotext output.
# The Latin1, ASCII7, and UTF-8 encodings are built into Xpdf. Other
# encodings are available in the language support packages.
textEncoding UTF-8
# Choose the end-of-line convention for multi-line copy-and-past and
# for pdftotext output. The available options are unix, mac, and dos.
#textEOL unix
#----- misc settings
# Enable FreeType, and anti-aliased text.
enableFreeType yes
antialias yes
# Set the command used to run a web browser when a URL hyperlink is
# clicked.
#launchCommand viewer-script
urlCommand "firefox '%s'"
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=znc
pkgver=1.8.0
pkgver=1.8.1
pkgrel=0
pkgdesc="Advanced IRC bouncer"
url="https://wiki.znc.in/ZNC"
......@@ -19,6 +19,8 @@ source="http://znc.in/releases/znc-$pkgver.tar.gz
$pkgname.confd"
# secfixes:
# 1.8.1-r0:
# - CVE-2020-13775
# 1.7.4-r0:
# - CVE-2019-12816
# 1.7.3-r0:
......@@ -108,6 +110,6 @@ _mv_to_sub() {
done
}
sha512sums="f0b9e0e8d7229d79c3fa00826067624d4e3a1ac1062419d5d5564404817f2a9c9047d52c3dccf01ac02333361798fbd8893bd9d55195f7e118416ef2374707dc znc-1.8.0.tar.gz
sha512sums="87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16 znc-1.8.1.tar.gz
47f9bd00f07861e195333d2cda5b1c7386e2324a1842b890837a7936a94b65b7a269f7fee656a522ec86b58a94bd451a2a3629bd6465578681b8d0733c2c77dc znc.initd
00360f9b487ed5a9d50c85ce597e65c89cf869cabb893c294d0bc7fcd88f9610ecb63ba6df7af1ba1dd977b6d5b05da625a3ee799a46d381f17ac04b976a1f29 znc.confd"
# Contributor: Aleks Bunin <alpinelinux@compuix.com>
# Maintainer: Aleks Bunin <alpinelinux@compuix.com>
pkgname=antibody
pkgver=6.0.1
pkgrel=0
pkgdesc="The fastest zsh shell plugin manager."
url="https://github.com/getantibody/antibody"
arch="all"
license="MIT"
depends="git zsh"
makedepends="go"
source="$pkgname-$pkgver.tar.gz::https://github.com/getantibody/antibody/archive/v$pkgver.tar.gz"
builddir="$srcdir/go/src/github.com/getantibody/antibody"
prepare() {
default_prepare
mkdir -p "$srcdir/go/src/github.com/getantibody"
mv "$srcdir/$pkgname-$pkgver" "$builddir"
}
build() {
export GOPATH="$srcdir/go"
go build -o antibody -ldflags "-X main.version=$pkgver" -trimpath
}
check() {
go test -v -cover ./...
}
package() {
install -sD -m 755 antibody "$pkgdir"/usr/bin/antibody
}
cleanup_srcdir() {
go clean -modcache
default_cleanup_srcdir
}
sha512sums="c370019238afbad550e2d99cb3487c3245f76fa897feb98a627f02cf0ef0bbfe1277d732b032e8ce7d338e3a3a5de39a5cbb2edf39e02363502b9b909098bfe3 antibody-6.0.1.tar.gz"
# Contributor: Duncan Bellamy <dunk@denkimushi.com>
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=asuran-cli
pkgver=0.1.5
pkgrel=0
pkgdesc="Asuran is a new archive format and rust implementation"
url="https://gitlab.com/asuran-rs/asuran"
arch="all !s390x !ppc64le !mips !mips64" #ppc64le takes too long to build
license="BSD-2-Clause-Patent"
makedepends="cargo openssl-dev"
source="https://gitlab.com/asuran-rs/asuran/-/archive/v$pkgver/asuran-v$pkgver.tar.gz"
builddir="$srcdir/asuran-v$pkgver"
build() {
local _aes=
case "$CARCH" in
aarch64*|x86_64) _aes="-C target-feature=+aes"
export RUSTFLAGS="$_aes" ;;
esac
cargo build --package asuran-cli --release --locked --verbose
}
check() {
cargo test all --release --locked --verbose
}
package() {
install -Dm0755 target/release/asuran-cli "$pkgdir"/usr/bin/asuran-cli
}
sha512sums="ac39dade83b36c4f4bae75216ac1a91daaf885abb5815e61f3150f2815b4b38c4ed200eae411cdc3b52c249527609493b6d05deb649dc4f5643b797fa1d40c33 asuran-v0.1.5.tar.gz"
# Maintainer: Alex Raschi <raschi.alex@gmail.com>
pkgname=chocolate-doom
pkgver=3.0.0
pkgver=3.0.1
pkgrel=0
pkgdesc="Portable release of Doom, Heretic, Hexen, and Strife"
url="https://www.chocolate-doom.org"
arch="all"
license="GPL-2.0-or-later"
depends=""
makedepends="sdl2-dev sdl2_net-dev sdl2_mixer-dev libpng-dev
libsamplerate-dev mesa-dev"
subpackages="$pkgname-doc"
options="!check" # no test suite
source="https://www.chocolate-doom.org/downloads/$pkgver/$pkgname-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
build() {
cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
......@@ -27,8 +24,7 @@ build() {
}
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
}
sha512sums="41f235c0d84ef21070636ad0610e97898dfd366fae7f9244bd2aebf8974db98dcf55f70bcab2f93589b9bf31dd421db32e8af88e0f8e0a655d2b9f1d4ead2afd chocolate-doom-3.0.0.tar.gz"
sha512sums="bec5daf5b26a8dd238780cb4e0c23ffc59b97825d323aa67bb6a3279cd243c18c03e899c4cb4b3106ac187330c6421915a14a6a7c0d34cb0ee75d6f29f9dc905 chocolate-doom-3.0.1.tar.gz"
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -649,7 +649,7 @@
if system == "linux":
linux_dist = info['dist'][0].lower()
if linux_dist in (
- 'arch', 'centos', 'debian', 'fedora', 'rhel', 'suse'):
+ 'alpine', 'arch', 'centos', 'debian', 'fedora', 'rhel', 'suse'):
var = linux_dist
elif linux_dist in ('ubuntu', 'linuxmint', 'mint'):
var = 'ubuntu'
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
@@ -21,7 +21,7 @@
disable_root: true
{% endif %}
-{% if variant in ["amazon", "centos", "fedora", "rhel"] %}
+{% if variant in ["alpine", "amazon", "centos", "fedora", "rhel"] %}
mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
{% if variant == "amazon" %}
resize_rootfs: noblock
@@ -72,6 +72,9 @@
- update_hostname
{% if variant not in ["freebsd", "netbsd"] %}
- update_etc_hosts
+{% if variant in ["alpine"] %}
+ - resolv_conf
+{% endif %}
- ca-certs
- rsyslog
{% endif %}
@@ -104,6 +107,9 @@
{% if variant in ["suse"] %}
- zypper-add-repo
{% endif %}
+{% if variant in ["alpine"] %}
+ - apk-configure
+{% endif %}
{% if variant not in ["freebsd", "netbsd"] %}
- ntp
{% endif %}
@@ -147,7 +153,7 @@
# (not accessible to handlers/transforms)
system_info:
# This will affect which distro class gets used
-{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu"] %}
+{% if variant in ["alpine", "amazon", "arch", "centos", "debian", "fedora", "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu"] %}
distro: {{ variant }}
{% else %}
# Unknown/fallback distro.
@@ -169,9 +175,9 @@
ntp_client: auto
# Other config here will be given to the distro class and/or path classes
paths:
- cloud_dir: /var/lib/cloud/
- templates_dir: /etc/cloud/templates/
- upstart_dir: /etc/init/
+ cloud_dir: /var/lib/cloud/
+ templates_dir: /etc/cloud/templates/
+ upstart_dir: /etc/init/
package_mirrors:
- arches: [i386, amd64]
failsafe:
@@ -198,8 +204,8 @@
primary: http://ports.ubuntu.com/ubuntu-ports
security: http://ports.ubuntu.com/ubuntu-ports
ssh_svcname: ssh
-{% elif variant in ["amazon", "arch", "centos", "fedora", "rhel", "suse"] %}
- # Default user name + that default users groups (if added/used)
+{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora", "rhel", "suse"] %}
+ # Default user name + that default user's groups (if added/used)
default_user:
{% if variant == "amazon" %}
name: ec2-user
@@ -212,17 +218,23 @@
{% endif %}
{% if variant == "suse" %}
groups: [cdrom, users]
+{% elif variant == "alpine" %}
+ groups: [adm, sudo]
{% elif variant == "arch" %}
groups: [wheel, users]
{% else %}
groups: [wheel, adm, systemd-journal]
{% endif %}
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+{% if variant == "alpine" %}
+ shell: /bin/ash
+{% else %}
shell: /bin/bash
+{% endif %}
# Other config here will be given to the distro class and/or path classes
paths:
- cloud_dir: /var/lib/cloud/
- templates_dir: /etc/cloud/templates/
+ cloud_dir: /var/lib/cloud/
+ templates_dir: /etc/cloud/templates/
ssh_svcname: sshd