...
 
Commits (604)
......@@ -4,16 +4,17 @@ set -eu
. "$(dirname "$0")"/common.sh
APK_TOOLS_URI='http://dl-cdn.alpinelinux.org/alpine/v3.4/main/x86_64/apk-tools-static-2.6.7-r0.apk'
APK_TOOLS_SHA256='342458308b8ebdb6a91d347b6b2cced7349c0cd0560a7fd7cdd71c5e1aa2b9f3'
APK_TOOLS_URI='https://github.com/alpinelinux/apk-tools/releases/download/v2.6.9/apk-tools-2.6.9-x86_64-linux.tar.gz'
APK_TOOLS_SHA256='694ec2063a0fc9455141da73ea85e4dbd8cd95823c33573936912429f0a45e5f'
title 'Downloading apk-tools-static'
title 'Downloading static apk-tools'
cd /tmp
wget "$APK_TOOLS_URI"
echo "$APK_TOOLS_SHA256 $(basename "$APK_TOOLS_URI")" | sha256sum -c
tar -xzf $(basename "$APK_TOOLS_URI")
wget -T 10 "$APK_TOOLS_URI"
echo "$APK_TOOLS_SHA256 ${APK_TOOLS_URI##*/}" | sha256sum -c
tar -xzf ${APK_TOOLS_URI##*/}
mv apk-tools-*/apk apk
title 'Installing Alpine Linux'
......@@ -25,7 +26,7 @@ echo "$MIRROR_URI/main" > etc/apk/repositories
cp -R "$CLONE_DIR"/.travis/keys etc/apk/keys
cp /etc/resolv.conf etc/resolv.conf
/tmp/sbin/apk.static \
/tmp/apk \
--root . --update-cache --initdb --no-progress \
add alpine-base
......
--- src/000000000000.cfg
+++ src/000000000000.cfg.new
@@ -3,18 +3,15 @@
@@ -3,7 +3,7 @@
<!-- For information on configuring Polycom VoIP phones please refer to the -->
<!-- Configuration File Management white paper available from: -->
<!-- http://www.polycom.com/common/documents/whitepapers/configuration_file_management_on_soundpoint_ip_phones.pdf -->
-<APPLICATION APP_FILE_PATH="sip.ld" CONFIG_FILES="" MISC_FILES="" LOG_FILE_DIRECTORY="" OVERRIDES_DIRECTORY="" CONTACTS_DIRECTORY="" LICENSE_DIRECTORY="" USER_PROFILES_DIRECTORY="" CALL_LISTS_DIRECTORY="" COREFILE_DIRECTORY="">
- <APPLICATION_SPIP300 APP_FILE_PATH_SPIP300="sip_213.ld" CONFIG_FILES_SPIP300="phone1_213.cfg, sip_213.cfg"/>
- <APPLICATION_SPIP500 APP_FILE_PATH_SPIP500="sip_213.ld" CONFIG_FILES_SPIP500="phone1_213.cfg, sip_213.cfg"/>
- <APPLICATION_SPIP301 APP_FILE_PATH_SPIP301="sip_318.ld" CONFIG_FILES_SPIP301="phone1_318.cfg, sip_318.cfg"/>
+<APPLICATION APP_FILE_PATH="sip.ld" CONFIG_FILES="Polycom/[PHONE_MAC_ADDRESS]-default.cfg, Polycom/initial.cfg" MISC_FILES="" LOG_FILE_DIRECTORY="log" OVERRIDES_DIRECTORY="Polycom" CONTACTS_DIRECTORY="Polycom" LICENSE_DIRECTORY="Polycom" USER_PROFILES_DIRECTORY="Polycom" CALL_LISTS_DIRECTORY="Polycom" COREFILE_DIRECTORY="Polycom">
+ <APPLICATION_SPIP300 APP_FILE_PATH_SPIP300="sip_213.ld" CONFIG_FILES_SPIP300=""/>
+ <APPLICATION_SPIP500 APP_FILE_PATH_SPIP500="sip_213.ld" CONFIG_FILES_SPIP500=""/>
+ <APPLICATION_SPIP301 APP_FILE_PATH_SPIP301="sip_318.ld" CONFIG_FILES_SPIP301=""/>
<APPLICATION_SPIP320 APP_FILE_PATH_SPIP320="sip_335.ld" CONFIG_FILES_SPIP320=""/>
<APPLICATION_SPIP330 APP_FILE_PATH_SPIP330="sip_335.ld" CONFIG_FILES_SPIP330=""/>
- <APPLICATION_SPIP430 APP_FILE_PATH_SPIP430="sip_327.ld" CONFIG_FILES_SPIP430="phone1_327.cfg, sip_327.cfg"/>
- <APPLICATION_SPIP501 APP_FILE_PATH_SPIP501="sip_318.ld" CONFIG_FILES_SPIP501="phone1_318.cfg, sip_318.cfg"/>
- <APPLICATION_SPIP600 APP_FILE_PATH_SPIP600="sip_318.ld" CONFIG_FILES_SPIP600="phone1_318.cfg, sip_318.cfg"/>
- <APPLICATION_SPIP601 APP_FILE_PATH_SPIP601="sip_318.ld" CONFIG_FILES_SPIP601="phone1_318.cfg, sip_318.cfg"/>
- <APPLICATION_SPIP670 APP_FILE_PATH_SPIP670="sip_404.ld" CONFIG_FILES_SPIP670=""/>
- <APPLICATION_SSIP4000 APP_FILE_PATH_SSIP4000="sip_318.ld" CONFIG_FILES_SSIP4000="phone1_318.cfg, sip_318.cfg"/>
- <APPLICATION_SSIP6000 APP_FILE_PATH_SSIP6000="sip_404.ld" CONFIG_FILES_SSIP6000=""/>
- <APPLICATION_SSIP7000 APP_FILE_PATH_SSIP7000="sip_404.ld" CONFIG_FILES_SSIP7000=""/>
+ <APPLICATION_SPIP430 APP_FILE_PATH_SPIP430="sip_327.ld" CONFIG_FILES_SPIP430=""/>
+ <APPLICATION_SPIP501 APP_FILE_PATH_SPIP501="sip_318.ld" CONFIG_FILES_SPIP501=""/>
+ <APPLICATION_SPIP600 APP_FILE_PATH_SPIP600="sip_318.ld" CONFIG_FILES_SPIP600=""/>
+ <APPLICATION_SPIP601 APP_FILE_PATH_SPIP601="sip_318.ld" CONFIG_FILES_SPIP601=""/>
+ <APPLICATION_SSIP4000 APP_FILE_PATH_SSIP4000="sip_318.ld" CONFIG_FILES_SSIP4000=""/>
-<APPLICATION APP_FILE_PATH="sip.ld" DECT_FILE_PATH="3111-17823-001.dect.ld" CONFIG_FILES="" SERVICE_FILES="" MISC_FILES="" LOG_FILE_DIRECTORY="" OVERRIDES_DIRECTORY="" CONTACTS_DIRECTORY="" LICENSE_DIRECTORY="" USER_PROFILES_DIRECTORY="" CALL_LISTS_DIRECTORY="" COREFILE_DIRECTORY="">
+<APPLICATION APP_FILE_PATH="sip.ld" DECT_FILE_PATH="3111-17823-001.dect.ld" CONFIG_FILES="Polycom/[PHONE_MAC_ADDRESS]-default.cfg, Polycom/initial.cfg" SERVICE_FILES="" MISC_FILES="" LOG_FILE_DIRECTORY="log" OVERRIDES_DIRECTORY="Polycom" CONTACTS_DIRECTORY="Polycom" LICENSE_DIRECTORY="Polycom" USER_PROFILES_DIRECTORY="Polycom" CALL_LISTS_DIRECTORY="Polycom" COREFILE_DIRECTORY="Polycom">
<APPLICATION_SPIP300 APP_FILE_PATH_SPIP300="sip_213.ld" CONFIG_FILES_SPIP300="phone1_213.cfg, sip_213.cfg" />
<APPLICATION_SPIP500 APP_FILE_PATH_SPIP500="sip_213.ld" CONFIG_FILES_SPIP500="phone1_213.cfg, sip_213.cfg" />
<APPLICATION_SPIP301 APP_FILE_PATH_SPIP301="sip_318.ld" CONFIG_FILES_SPIP301="phone1_318.cfg, sip_318.cfg" />
@@ -13,8 +13,5 @@
<APPLICATION_SPIP501 APP_FILE_PATH_SPIP501="sip_318.ld" CONFIG_FILES_SPIP501="phone1_318.cfg, sip_318.cfg" />
<APPLICATION_SPIP600 APP_FILE_PATH_SPIP600="sip_318.ld" CONFIG_FILES_SPIP600="phone1_318.cfg, sip_318.cfg" />
<APPLICATION_SPIP601 APP_FILE_PATH_SPIP601="sip_318.ld" CONFIG_FILES_SPIP601="phone1_318.cfg, sip_318.cfg" />
- <APPLICATION_SPIP670 APP_FILE_PATH_SPIP670="sip_404.ld" CONFIG_FILES_SPIP670="" />
<APPLICATION_SSIP4000 APP_FILE_PATH_SSIP4000="sip_318.ld" CONFIG_FILES_SSIP4000="phone1_318.cfg, sip_318.cfg" />
- <APPLICATION_SSIP6000 APP_FILE_PATH_SSIP6000="sip_404.ld" CONFIG_FILES_SSIP6000="" />
- <APPLICATION_SSIP7000 APP_FILE_PATH_SSIP7000="sip_404.ld" CONFIG_FILES_SSIP7000="" />
</APPLICATION>
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-provisioning-polycom
pkgver=5.3.2
pkgver=5.5.1
pkgrel=0
pkgdesc="Files for provisioning Polycom IP phones"
url="http://www.polycom.com/products/voice/index.html"
......@@ -9,10 +9,10 @@ arch="noarch"
license="AS IS"
depends=""
makedepends=""
# Make sure 5.3.2 comes after 4.0.8c so that older files are overwritten
source="http://downloads.polycom.com/voice/voip/uc/Polycom_UC_Software_4_0_8_Rev_C_release_sig_split.zip
# Make sure 5.5.1 comes after 4.0.11 so that older files are overwritten
source="http://downloads.polycom.com/voice/voip/uc/Polycom_UC_Software_4_0_11_rts15_release_sig_split.zip
http://downloads.polycom.com/voice/voip/uc/SoundPoint_IP_BootROM_4_4_0B_Upgrader_release_sig.zip
http://downloads.polycom.com/voice/voip/uc/Polycom_UC_Software_5_3_2_release_sig_split.zip
http://downloads.polycom.com/voice/voip/uc/Polycom_UC_Software_5_5_1_rts35_release_sig_split.zip
000000000000.cfg.patch
000000000000-phone.cfg
000000000000-web.cfg
......@@ -83,24 +83,24 @@ default_unpack() {
done
}
md5sums="be6364402a35d4fc3f38d817a2bd5117 Polycom_UC_Software_4_0_8_Rev_C_release_sig_split.zip
md5sums="e349c0b24cc118a5ef85b52d7e82b116 Polycom_UC_Software_4_0_11_rts15_release_sig_split.zip
b5ac28a1b4ede82fca226675c0b6981d SoundPoint_IP_BootROM_4_4_0B_Upgrader_release_sig.zip
be7694a0c852f528f4a17627d4cb1547 Polycom_UC_Software_5_3_2_release_sig_split.zip
a567851b650cf3e7a20f26ec3f63bf75 000000000000.cfg.patch
cdbf5322601881e37268b17048306097 Polycom_UC_Software_5_5_1_rts35_release_sig_split.zip
936110c5fbb17545526dc005f5b49c40 000000000000.cfg.patch
2c32486b7c9d692326fd6270664eac01 000000000000-phone.cfg
2c32486b7c9d692326fd6270664eac01 000000000000-web.cfg
4a6ff93b944a710da0c3eb99938f42cc 000000000000-directory.xml"
sha256sums="b2ffe49f306b071b9e04e1049b4293dda06e8e1e5c27fd129af31ec535cbd381 Polycom_UC_Software_4_0_8_Rev_C_release_sig_split.zip
sha256sums="0904a07dbcf3e8c6a697f76201581c6b4d6c200aa8c5ef420b43824eb4abb310 Polycom_UC_Software_4_0_11_rts15_release_sig_split.zip
4565248f354321901323d01b1aeed8bb6e00beedc331a3f7545cbae83d194113 SoundPoint_IP_BootROM_4_4_0B_Upgrader_release_sig.zip
eb8ddb122888996189525c5bba3ad076aa78eb8e551cc17ce9959bd198fb6dff Polycom_UC_Software_5_3_2_release_sig_split.zip
81346cdbafcd6e370debde74a2894ea93e777cff631b27321f3bf7300329bb60 000000000000.cfg.patch
464f360201f8b0c8506686f64b0a1c9981ff62c790cc06a69bd22ba9cf2d38e0 Polycom_UC_Software_5_5_1_rts35_release_sig_split.zip
286b77f8b18a70a7e42b6eaa6ff9ae7e849e3335dbf2cfb6390ee69243f0d4c7 000000000000.cfg.patch
e2f3dcd842d6eb44a98140e7fb60487ca70e519d5d09872a54ce1372d5a432b4 000000000000-phone.cfg
e2f3dcd842d6eb44a98140e7fb60487ca70e519d5d09872a54ce1372d5a432b4 000000000000-web.cfg
875f5bbec057d29508bcd671a203d8e2852cd959aeaeb937443cedbe824e0a41 000000000000-directory.xml"
sha512sums="1ca4b9975948f2266e299aa6a27c29554898af04ad07f6a76b6033b95473f915c4d96c132e9ab67cc32613f95a4433129f05a7c125dbd3a53b9c393e68c0e871 Polycom_UC_Software_4_0_8_Rev_C_release_sig_split.zip
sha512sums="e416838352d6e8a524ca48981875e9ebe384ba4bd27d056842fb8c6de73356599aec65466867fa242214d79e0060d262268b0e82008674da694a2fc48a31b3fc Polycom_UC_Software_4_0_11_rts15_release_sig_split.zip
b624b6618af41c21de016ead0746be9702834632e32de1bd62a5b47ad2308f0fb9def72fcfb35259731b7431d00a958e9c4ad3ad7d7257a29bba9e976dc70c4c SoundPoint_IP_BootROM_4_4_0B_Upgrader_release_sig.zip
ecee627af77d41b3bce6b55c2908bbe85e78a494dc2cf925d5bae2eb033da1517e3e5601e3219a5a75fd8c1857b72bc62848d86283a0c6ea68abae17fc81306f Polycom_UC_Software_5_3_2_release_sig_split.zip
8ec2605c84f8e5db50fff0ed842dc965a10457d72d9672b176b680d5599e93947c0c6011513cacc84ff5f324df573d38e09ac7301b27f6dcac40af3c56392639 000000000000.cfg.patch
adeefe00bf5af0a7408dacc6175575634c5d47f0f796e3b251166957e266f3bb1c30e79a1af68b4675d62458680ccd604ea38d2ff0510bb463caebff8080bed3 Polycom_UC_Software_5_5_1_rts35_release_sig_split.zip
32e1c0585baa3d827e12f2a501955ae7ee4f8f0594b14d188235a4f3dbdcb6d241ba2bf52ed4abfc94456dc5984d170f1f8aaa72a8fc56b5b578f6ba289b38b6 000000000000.cfg.patch
db2da0f4c393bdea773f3e5a7daa581a58caca738538db6153b223383176aae30e2081c198291d78c44eddd446a1cab9cffef78646360847ce4955c59f288300 000000000000-phone.cfg
db2da0f4c393bdea773f3e5a7daa581a58caca738538db6153b223383176aae30e2081c198291d78c44eddd446a1cab9cffef78646360847ce4955c59f288300 000000000000-web.cfg
9adc73d02aa4f545aca893c335284d77099c56fcc17a48f61003ede8713e96aeb8f467896f4dfbf7db67255cc3d60faf353b76ab86c5881d0ba884d1c0acffb3 000000000000-directory.xml"
# Contributor: Olivier Mauras <olivier@mauras.ch>
# Maintainer: Olivier Mauras <olivier@mauras.ch>
pkgname=borgbackup
pkgver=1.0.8
pkgver=1.0.9
pkgrel=0
pkgdesc="Deduplicating backup program"
url="https://borgbackup.readthedocs.io/"
......@@ -25,6 +25,6 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir" || return 1
}
md5sums="0d8e87cbe288fe063ccacd31825f8de6 borgbackup-1.0.8.tar.gz"
sha256sums="6902563c447c4f378ff1a13167f83d15eb60a02316a06368a539b7ff3d88aeb9 borgbackup-1.0.8.tar.gz"
sha512sums="2a24b302da6cf0266c53a5efc7c1f500c3a3f290c1a49abbced981d2e252886e81b828ab092518f675a81b9865079af66ea34d035b34ebf19a86a153fff6bd45 borgbackup-1.0.8.tar.gz"
md5sums="82d660768434af0311f48cb489f59b67 borgbackup-1.0.9.tar.gz"
sha256sums="35860840e0429d4bb3acc8b9dd33aa5996a42fb2b678813a982b321a7dba3cb2 borgbackup-1.0.9.tar.gz"
sha512sums="5623916b143a3d39cab41bc5cca82589a612035d9be0bfd0d211656a975b986bc0c04133bdd1ba44b628fffd84f2c4294530a7c37b9c874e878b77d6105ff0ad borgbackup-1.0.9.tar.gz"
From 15fc71cc82f2dc93321b60d557efdc968f5d9433 Mon Sep 17 00:00:00 2001
From: Breno Leitao <breno.leitao@gmail.com>
Date: Tue, 9 May 2017 16:54:49 +0000
Subject: [PATCH] Define PATH_MAX if not defined
On systems without glibc, you might lack definition of PATH_MAX.
Defining it as already defined it for interface_http.c as defined in
civetweb.c.
---
src/modules/interface/http/interface_http.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/modules/interface/http/interface_http.c b/src/modules/interface/http/interface_http.c
index 5c71e8e..4686c89 100644
--- a/src/modules/interface/http/interface_http.c
+++ b/src/modules/interface/http/interface_http.c
@@ -53,6 +53,10 @@
#include <json.h>
#endif
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
#include <captagent/globals.h>
#include <captagent/api.h>
#include <captagent/structure.h>
--
2.12.2
# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=captagent
pkgver=6.1.0.20
pkgrel=3
pkgdesc="HEP Capture Agent for HOMER"
url="https://github.com/sipcapture/captagent"
arch="all"
license="GPL3"
makedepends="autoconf automake bison expat-dev flex flex-dev json-c-dev libtool libpcap-dev linux-headers"
source="$pkgname-$pkgver.tar.gz::https://github.com/sipcapture/captagent/archive/$pkgver.tar.gz
$pkgname.initd
0001-Define-PATH_MAX-if-not-defined.patch
ac-fix.patch"
builddir="$srcdir/$pkgname-$pkgver"
build() {
cd "$builddir" && ./build.sh && ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc &&
make
}
package() {
cd "$builddir" && make install DESTDIR="$pkgdir" && \
install -D "$srcdir"/$pkgname.initd \
"$pkgdir"/etc/init.d/$pkgname && \
rm "$pkgdir"/usr/lib/$pkgname/modules/*.a
}
sha512sums="b867a41dfe98015f01fa8c67e57214754231eeec40d0685983fca9aacf53cc5287c2c9959f4752c80004ad5abc2e8a96058797b6b7cdc259a48443c1a909b609 captagent-6.1.0.20.tar.gz
750326291fc65fa9a3568f6961f2d6b950baa715e75ad7fc8263956cc91c50445e2e041d8f73675a350ba0d55786908564b439396376d8105fb69332e8aefc27 captagent.initd
f7c04f5e273dd362f09fd1e6a605f56dcaf64c71cd0d6ba16dadaca5e005b1f29dccd81b186c3727d2fc7872bd684ca4ddc8fc7a2a36fd83956592a134ea6a37 0001-Define-PATH_MAX-if-not-defined.patch
c0bbbbf2f96c7644b154e71b672af5a0d7c209dd5b309b6f6b35915a04f30a33ff4fc18e408e3f1641d4ca6ae51430f9ac0189984f828353263fb52e985b47c1 ac-fix.patch"
diff -ru captagent-6.1.0.20/configure.ac captagent-6.1.0.20.alpine/configure.ac
--- captagent-6.1.0.20/configure.ac 2016-06-01 14:42:19.000000000 +0300
+++ captagent-6.1.0.20.alpine/configure.ac 2017-02-03 22:06:46.098797592 +0200
@@ -181,7 +181,7 @@
echo " the LDFLAGS to set its proper path.";
AC_MSG_ERROR([Fatal: libjson not found.])])])
-AC_CHECK_LIB(fl, yywrap, [ FLEX_LIBS="-lfl" ] , [AC_MSG_ERROR([captagent requires but cannot find libfl])])
+FLEX_LIBS="-lfl"
AC_SUBST(PTHREAD_LIBS)
AC_SUBST(DL_LIBS)
#!/sbin/openrc-run
# init.d file for captagent
# Copyright (c) 2017 Kaarle Ritvanen
name=captagent
command=/usr/bin/$name
command_args=-d
pidfile=/var/run/$name.pid
depend() {
need net
}
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=chromium
pkgver=55.0.2883.87
pkgver=56.0.2924.76
pkgrel=0
pkgdesc="chromium web browser"
url="http://www.chromium.org/"
......@@ -341,7 +341,7 @@ chromedriver() {
mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin || return 1
}
md5sums="c389ad65365d76b36cb56952e76835e4 chromium-55.0.2883.87.tar.xz
md5sums="db1efe3e0c843e4237052432f2a46d58 chromium-56.0.2924.76.tar.xz
b6d015c1da85aa65ee21bc974c7fc7d2 chromium-launcher.sh
c5aa73a87d4b88cce9f1a680ca691bb6 chromium.conf
2962ac6259e39a797d441daf43aa49c9 chromium.desktop
......@@ -355,10 +355,10 @@ c5aa73a87d4b88cce9f1a680ca691bb6 chromium.conf
c805e026abc748d9925fab8250760bcc musl-sandbox.patch
d232b8dcb4d4db9a868c89e3a48ee716 no-execinfo.patch
886bc4ce1423a185b4d969ec2daa5933 no-getcontext.patch
3dd580483ebf0a94db90d35288c0f340 no-mallinfo.patch
69fa53e833ae7a4cd30fc387b781602a no-mallinfo.patch
f99a4572c0be2c2123acc2478905e01f resolver.patch
bff9e1de1e5fa119b41bf6705926cd9e unset-madv_free.patch"
sha256sums="e81bd3140d9c84dfee04d9a94686dfe6a20ae79475d84f17154c5536dcb81a58 chromium-55.0.2883.87.tar.xz
sha256sums="cfb08e226b9c16ad887eb96d715a9cc4ab097d1a79e2e68c8749a7a4164b3c38 chromium-56.0.2924.76.tar.xz
89f1eb19d1ed998a190045ea173959f01faee3490d58a6a34ca3fe21228e569f chromium-launcher.sh
b466559340a36998354a0577325fe533d9e6b74c24a15b7599671171506bf128 chromium.conf
3ae90cea7503d0039de53448ed112b9bc0cb5a09f6b0045506eb777fc23517e5 chromium.desktop
......@@ -372,10 +372,10 @@ ef7ff14f3e91a72d1d7437b5edf5d3cf1ac04e1c80cfb8c2f2fe5c93bc80bb27 gn_bootstrap.p
3d0303f9ea04b2c24e16068ea2d423fce0e37ebb2b89dde342f9e8f9d0b149b4 musl-sandbox.patch
18ee716e709da867d6e8b8dcf4c5e33dc9def31781ff40f2ec3fc2860705dd24 no-execinfo.patch
855edf1062e199ceaa7619d5bb81ff6939cc5ee1c947dfd15b50e0cba18548e2 no-getcontext.patch
3a5d4c8e38c6345eec21ed9d6f0b82aaddfca310fd7d5f57e7ec1c359f59ef2e no-mallinfo.patch
375473b274691ec565bee26ffbca4c917efc646df86051ea00402540c308223c no-mallinfo.patch
914c513bb54d4d97cd2a7622647f6af5cd0c8d29a0aa2962a60fdbed88f54429 resolver.patch
e9c1f901c7bc8102a31ef2cc2235892671357362c04a4a1f009f54830449ef5f unset-madv_free.patch"
sha512sums="b39b5a9e50d9406cc21db1f5972a02dfba74eb2d5f8b0accde4d2aeca07bcddc6bbdf44ea6f5414a755f8ed0b0852381cb1c7b4f0cb02742146db314e4a0c55e chromium-55.0.2883.87.tar.xz
sha512sums="ddcb2f0c76bdad3b87dc9219367764cb9adb900d7581dc5a371184ebfe2581f6ecbfc9aae02115e87291a5b90587fc145dada2b0940ae60fc19d25f5c505022d chromium-56.0.2924.76.tar.xz
b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh
f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf
e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c chromium.desktop
......@@ -389,6 +389,6 @@ e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b3
ce8276bb35a8d72cf58868a6331e85286b350a1aad694525ebf637499819219dd4d87ab67dd3b938830a6bd3e7172fc9bcd9c8971820d0ed95c0d141867a24fe musl-sandbox.patch
fef119b4e23269cc6252e940e23029a312c9852b8d2115ee155ef9a4f5788b6b7dc8c1cab2e32fb4f25c2956a4dd2305375cbd1847c58d7159d15907d6b17a5d no-execinfo.patch
a57858e45cfbb7e97f77b3b308502e377543d61d3d0085798ed73bc53da456828f5e010308d0de05fee4fe52071362d074f5af205f98f41d67222d997857d626 no-getcontext.patch
0d2e4b64f5bcb0ece5cf0cace493b07e900b14d9da5e4173a3034322ff264ab1978364000442c83240983ac0aa5f2b18f941bb5121b043a1e8e28e7de94fa44b no-mallinfo.patch
7eac76f78b734404510d6e850b3eb55d10ae74ed48072dd318a751cc6fd806363eb82544602f5b6724548a34b418658b9fb0941c88ced0dc4f0ee77cfb172d0d no-mallinfo.patch
d60407a8faadfd2a8294570163b4d1b1112c8a70a6f8e778fc3aff25d20613a2e26c66cd87e69c54953cc1b984e4038015ad04797b0495df13932541b05398fe resolver.patch
5eafc0b92d6aa3a4a94bce544461d57121a9405784e2687b9ed382371a7c10e4db5fd6325057344a66b7df32dca963bc12b7f67b256f1f1295bf6519400b0b8e unset-madv_free.patch"
......@@ -20,3 +20,66 @@
size_t GetMemoryUsageKB() {
struct mallinfo minfo = mallinfo();
uint64_t mem_usage =
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index d569350..6edcffe 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -1821,6 +1821,49 @@ static size_t GetMallocUsage() {
}
} // namespace
+#elif defined(OS_LINUX) && !defined(__GLIBC__)
+namespace {
+
+static size_t GetMallocUsage() {
+ char *line=NULL;
+ size_t n,usage=0;
+ FILE *f = fopen("/proc/self/maps", "r");
+ char *path, *perm;
+ if (f == NULL) {
+ perror("/proc/self/maps");
+ return 0;
+ }
+ path = (char *)malloc(PATH_MAX+16);
+ if (path == NULL)
+ goto out;
+ perm = path + PATH_MAX;
+
+ while (getline(&line, &n, f) >=0) {
+ size_t start,end,offset,inode;
+ int devmaj, devmin, items;
+
+ items = sscanf(line, "%zx-%zx %s %zx %x:%x %zu %s",
+ &start, &end, perm, &offset,
+ &devmaj, &devmin, &inode, path);
+
+ if (items < 7)
+ continue;
+
+ if (items < 8)
+ path[0] = '\0';
+
+ if ((strcmp(perm, "rw-p") == 0 && devmaj+devmin == 0)
+ && (path[0] == '\0' || strcmp(path, "[heap]") == 0))
+ usage += end-start;
+ }
+ free(line);
+ free(path);
+out:
+ fclose(f);
+ return usage;
+}
+
+} // namespace
#endif
// TODO(tasak): Once it is possible to use memory-infra without tracing,
@@ -1839,7 +1882,7 @@ void RenderThreadImpl::RecordPurgeAndSuspendMetrics() const {
blink_stats.partitionAllocTotalAllocatedBytes / 1024);
UMA_HISTOGRAM_MEMORY_KB("PurgeAndSuspend.Memory.BlinkGCKB",
blink_stats.blinkGCTotalAllocatedBytes / 1024);
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
struct mallinfo minfo = mallinfo();
#if defined(USE_TCMALLOC)
size_t malloc_usage = minfo.uordblks;
# Maintainer: Eivind Uggedal <eivind@uggedal.com>
pkgname=docker
pkgver=1.12.3
pkgver=1.12.6
_ver=${pkgver/_/-}
pkgrel=0
_gitcommit=v$_ver
......@@ -146,15 +146,15 @@ vim() {
done
}
md5sums="40510f377b781c72847ae6a06fdbb175 docker-1.12.3.tar.gz
md5sums="2db317ab9811641449784fe0fb29d74f docker-1.12.6.tar.gz
716d0b284ce42490eeb83befba10fafb runc-cc29e3dded8e27ba8f65738f40d251c885030a28.tar.gz
f0a0c1101ad259b84fb457c8c7036723 containerd-0ac3cd1be170d180b2baed755e8f0da547ceb267.tar.gz
41d0008283777d8ea7e8ab6ebe230c07 docker-openrc-fixes.patch"
sha256sums="cf4f876593abde06b4c19f971163a853a21b1992d75bd2fe5d8bea9015b09f87 docker-1.12.3.tar.gz
sha256sums="0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e docker-1.12.6.tar.gz
196b78c6caf1a4c6257314b393381baffa7c82bb2690ac02a7b3d6cd6cfe7776 runc-cc29e3dded8e27ba8f65738f40d251c885030a28.tar.gz
5c1bcd8e3b7bc6034e7523b6eca7de974562b7fdc72c440494234ae10a0e545b containerd-0ac3cd1be170d180b2baed755e8f0da547ceb267.tar.gz
13835e08cc7a7a530f19a037d9e1442f1393a6573bec60fe9d41b434c460200d docker-openrc-fixes.patch"
sha512sums="8577bcfe892d1fae6ca4edcd72c1a1c0a223ea3e322f3b63674dcb4833605c2dd2365cf376e4e08c0a900db50a927aaa0518ceb25f9542fe30c52a28903b0201 docker-1.12.3.tar.gz
sha512sums="98e0fa0ec0dad4d392188b0d2cf42b2b564403463c369e1fe060f1abc2e97d97375a88587080671ef905e6a34b991d83265f43c3112575af019cf85eef0c2c25 docker-1.12.6.tar.gz
0bf8ce3bb15caaf09214f23a411003fd5b660d291662ad513c3d944647a0fa9b270d18902706b7e6aa3c30eb0f676e73af46b8249d1e2484e1dc40d6ffd5a80d runc-cc29e3dded8e27ba8f65738f40d251c885030a28.tar.gz
a47200c2f867d6624e51eb1aa83743f1e0b86d96d462b7649c240f335eb72e499a00923e190759e57d4c456d912f9541750e9df21ebc2b713b87bea1ead55e7b containerd-0ac3cd1be170d180b2baed755e8f0da547ceb267.tar.gz
42f35d9e7a82f6f4cc0b6a6ecfc1a970f935c54aa639873a49c5be5dc62a50503a9435ddfe5af74d378e1297b0e1509f5cbe84a7ba98bd0b51deeaa25495415d docker-openrc-fixes.patch"
......@@ -2,7 +2,7 @@
# Maintainer:
_php=php5
pkgname=drupal7
pkgver=7.52
pkgver=7.59
pkgrel=0
pkgdesc="An open source content management platform"
url="https://www.drupal.org/"
......@@ -68,6 +68,6 @@ package() {
"$pkgdir"/var/lib/$pkgname/sites/default/files || return 1
}
md5sums="4963e68ca12918d3a3eae56054214191 drupal-7.52.tar.gz"
sha256sums="ea09ec7c3555856591b7ac739dafbe7dbfba47d1ffe2a9a1f17fda490a91b8e8 drupal-7.52.tar.gz"
sha512sums="4fd2721b87d7e160ccf202894c5ec11e836796be6dce3fbfe187eea826175822677c26079a3dae4567e0615e8f376a88c07a8979b619bb4ac1096c8ea5c8f802 drupal-7.52.tar.gz"
md5sums="7e09c6b177345a81439fe0aa9a2d15fc drupal-7.59.tar.gz"
sha256sums="292c8741cd76b0baff33a36510e52fc8e189367498c8bcaae5da6ff15bdaaff6 drupal-7.59.tar.gz"
sha512sums="68f02b39d1a4658adc0f0046c22cc1059b68f952f9cd753f5a3e379cf93705be308b4727519e90d77a42437442daebaa78d76745954be4d40e1a5105c319069c drupal-7.59.tar.gz"
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=firefox-esr
pkgver=45.6.0
pkgver=45.9.0
_pkgver=$pkgver
_xulver=$pkgver
pkgrel=0
......@@ -76,7 +77,19 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
firefox.desktop
firefox-safe.desktop"
_builddir="${srcdir}/firefox-${pkgver}esr"
# secfixes:
# 45.7.0-r0:
# - CVE-2017-5373
# - CVE-2017-5375
# - CVE-2017-5376
# - CVE-2017-5378
# - CVE-2017-5380
# - CVE-2017-5383
# - CVE-2017-5386
# - CVE-2017-5390
# - CVE-2017-5396
builddir="${srcdir}/firefox-${pkgver}esr"
_mozappdir=/usr/lib/firefox-$pkgver
_mozappdirdev=/usr/lib/firefox-devel-$pkgver
......@@ -86,7 +99,7 @@ ldpath="$_mozappdir"
prepare() {
local i
cd "$_builddir" || return 1
cd "$builddir" || return 1
for i in $source; do
case $i in
......@@ -99,7 +112,7 @@ prepare() {
}
build() {
cd "$_builddir"
cd "$builddir"
# mozilla's buildsystem is on drugs
export CFLAGS="$(echo $CFLAGS | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')"
......@@ -114,7 +127,7 @@ build() {
}
package() {
cd "$_builddir"
cd "$builddir"
# only used for startupcache creation.
local paxflags="-msp"
......@@ -127,7 +140,7 @@ package() {
install -m755 -d ${pkgdir}/usr/share/applications
install -m755 -d ${pkgdir}/usr/share/pixmaps
install -m644 "$_builddir"/browser/branding/official/default48.png \
install -m644 "$builddir"/browser/branding/official/default48.png \
${pkgdir}/usr/share/pixmaps/firefox.png || return 1
install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/firefox.desktop
install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/firefox-safe.desktop
......@@ -170,7 +183,7 @@ dev() {
default_dev
}
md5sums="ee3cf2401a5716cebacaae5fb70d133f firefox-45.6.0esr.source.tar.xz
md5sums="f4d83c5150fc5085db20d71862497eb8 firefox-45.9.0esr.source.tar.xz
1f4c60e662ed93784431bd06c5141719 mozconfig
99b27aeac58923f318d083e5e71879ba vendor.js
6ab77b80c8c7d6fd07ab53c54561f4df 0002-Use-C99-math-isfinite.patch
......@@ -191,7 +204,7 @@ b8b2a3cdb38f402e4eb4885908233811 libavutil.patch
c35d743dd706093ff5aa7dbb7e6168bb gcc6-fix-compilation.patch
ba96924ece1d77453e462429037a2ce5 firefox.desktop
6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop"
sha256sums="c1e7ddf6efb0f54c8071131b6395f4942a422c2ab70f2e9a81b588373d6fbf5b firefox-45.6.0esr.source.tar.xz
sha256sums="2afb02029e115fae65dbe1d9c562cbfeb761a6807338bbd30dbffba616cb2d20 firefox-45.9.0esr.source.tar.xz
23c2b4535ce83c92ba978e15ce328c9f140def155d12523c00df30baf41b98dc mozconfig
afecb8c17a2bedafe600dd572d24eff24e540cda02f675705d11168040379ce6 vendor.js
080a55182b865471a86fa4b70a66ed9495f1e536f7fdc4060cb8c675b4749c6e 0002-Use-C99-math-isfinite.patch
......@@ -212,7 +225,7 @@ a1ba79ec0c50c19edcfb24bb2686a718a77b02035e412989b9208b9b818abe14 allow-utf8-fal
5ae2edf65b65a29c8d266343230c0ba9268f864697fc1f984d79e980a365a8fc gcc6-fix-compilation.patch
b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda firefox.desktop
4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3 firefox-safe.desktop"
sha512sums="b96c71aeed8a1185a085512f33d454a1735237cd9ddf37c8caa9cc91892eafab0615fc0ca6035f282ca8101489fa84c0de1087d1963c05b64df32b0c86446610 firefox-45.6.0esr.source.tar.xz
sha512sums="2e4c1f8bca0c59ac93ab918b996e3b6cf25e7279ad5800de256aa220e670c6aaab2036c3ead4020b80e2a0e8cda3ae5fe9b270106646c625ce4fd6ecfd66d9ca firefox-45.9.0esr.source.tar.xz
e14b4a646230f7a752ef864b0e6a074fdac74d6c4abde2c31656eb10ac6f002a5c664d257bf3f4bd22544f10103e38d5fae49f84fcaae402b81940e72bcfe0e5 mozconfig
cc10dba32d9c7faf1d99b8fdebc71bf0200ad10b976105edb45df696bf64a668b2b7aa8c3892a8056eb71fb071b0e0ae51c3ce2fb75acfb7e7035104c0e4fce3 vendor.js
7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8 0002-Use-C99-math-isfinite.patch
......
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=firejail
pkgver=0.9.44.2
pkgver=0.9.44.4
pkgrel=0
pkgdesc="Linux namespaces and seccomp-bpf sandbox"
url="https://firejail.wordpress.com/"
......@@ -49,6 +49,6 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
md5sums="52e296946129e430092fb0dce1ecb3a3 firejail-0.9.44.2.tar.gz"
sha256sums="d06efc94cef17632adf2cb086ccf4622a07e0809bff3a6765bde16be84181ec1 firejail-0.9.44.2.tar.gz"
sha512sums="44ffcf1a71939b692f31c49742ed28c328d1c53ba287acd0924f45eb723a0e28ed34d8068edbb876faa0c33856e389069d623ce397de267d77330faa240c2302 firejail-0.9.44.2.tar.gz"
md5sums="a6a6a4970e3e93498c69f328f8a338cd firejail-0.9.44.4.tar.gz"
sha256sums="35da9220f220b23bc643de5acc38f3eda3f04edb083f997d8a57301bb296279a firejail-0.9.44.4.tar.gz"
sha512sums="3aa9b355fcbc743e20fd5954f03df1ae30adc95e3b18074622833f016bc52175c21b7533a1df251b39a53288c2e0cbdd81185cb1fcf46eccba4e645eca2e3d41 firejail-0.9.44.4.tar.gz"
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk-vnc
pkgver=0.6.0
pkgver=0.7.0
pkgrel=0
pkgdesc="A VNC viewer widget for GTK"
url="http://live.gnome.org/gtk-vnc"
......@@ -13,6 +14,11 @@ makedepends="$depends_dev gettext-dev intltool expat-dev
source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-dev gvncviewer $pkgname-lang $pkgname-doc"
# secfixes:
# 0.7.0-r0:
# - CVE-2017-5884
# - CVE-2017-5885
builddir="$srcdir/$pkgname-$pkgver"
build () {
cd "$builddir"
......@@ -39,6 +45,6 @@ gvncviewer() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
md5sums="f27fa9284276509e8b785e4956d5334f gtk-vnc-0.6.0.tar.xz"
sha256sums="9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433 gtk-vnc-0.6.0.tar.xz"
sha512sums="38d37753bd8c88d112c046eb8430383b073b6516c72660b3e53612986a6772b72e3e6037f61e7a3700980ab1509c1f44fbfe0b80594c8a5e5520df166212f158 gtk-vnc-0.6.0.tar.xz"
md5sums="cf55bce70ff1f7b1643468a001be1bef gtk-vnc-0.7.0.tar.xz"
sha256sums="3c2eae7c9053338939a32c9987156a12b802ffd5c7f80702ba8d483dfc6d483e gtk-vnc-0.7.0.tar.xz"
sha512sums="553a2794ca5351a57760acd44f1fb36e16b7ba48404213f1a998c886257045cfb0670ef6124ba1b2a68eee26e34b00b4c00b00f4fc1b9e5f64f227fdccc35a47 gtk-vnc-0.7.0.tar.xz"
# Contributor: Bennett Goble <nivardus@gmail.com>
# Maintainer: Bennett Goble <nivardus@gmail.com>
pkgname=h2o
pkgver=2.0.4
pkgrel=1
pkgver=2.0.5
pkgrel=0
pkgdesc="An optimized HTTP/1, HTTP/2 server written in C"
url="https://h2o.examp1e.net"
arch="all"
......@@ -47,15 +47,15 @@ package() {
install -m700 -d "$pkgdir"/var/log/$pkgname || return 1
}
md5sums="86719a22a35afe665e187e6f81b259ae h2o-2.0.4.tar.gz
md5sums="e5d8969d0550e66ddf412b38c57e8ef9 h2o-2.0.5.tar.gz
7d986844504a8106732d0128063faea0 h2o.conf
a1ad5f38f26603bd673106e7d6848469 h2o.initd
bb8f7d3d7589b6fca65b563f984cddda h2o.logrotate"
sha256sums="c0efa18f0ffb0f68ee4b60a6ed1feb54c770458c59e48baa2d9d0906ef9c68c0 h2o-2.0.4.tar.gz
sha256sums="0ce4f16184813d7c8045f41e293457a3526b7d8b18a89105cdfd16330005926b h2o-2.0.5.tar.gz
05a712800b959aa3440307afdcd7a3a6ab8c17f48e1bfa3751a87cc67baf8737 h2o.conf
707c02f7f47590e5bbea5688e2a5ca014a861dfdd4e0013f64094cb45d3ac397 h2o.initd
43c3bacfddd1fc6c3c9a985e915bfd555e6282b27bb8da8862272d187490832e h2o.logrotate"
sha512sums="5d8317a65c77294c8bc5388b65905aa614726ee0630705e70c7d419684f303e3006fa77d54e4c28dbdf3cde522324a03b318513e4de304cf5712ca44ad1a89c7 h2o-2.0.4.tar.gz
sha512sums="f0eff966fece7aab39575c8e7f479bec25f2b3bb4355478b0a13ff2bac028a07e593fc497fea070af4892836ec4540529d418a3d1fdffe5e55c1ce3d5f4e0c1e h2o-2.0.5.tar.gz
444f55c3eaae1f349223036086e45c983ea8be89e793068537ec25488c4065174bc509d0987ddc65a0357cb8acfec272e90d13ea7cdadf9cf112953d857aa574 h2o.conf
e93e66a6b00b1bff94e37489c5fdf99d9d657adc63975ec54be30f8da23dafe7d7389f02a6452ed819efc9d8398aa716782a7fd6d8509621a975ed954b73bef9 h2o.initd
3d2c9e36c48cbb974d0691e4af8e9eb8f13e3bebb98a30417cdc87e76a4b5cddc4e4f665ebea26b95174287b95d002fdc3363f30ffcf15247fcd0530fe1abfcc h2o.logrotate"
......@@ -2,7 +2,7 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=imapsync
pkgver=1.727
pkgrel=0
pkgrel=1
pkgdesc="IMAP synchronisation, sync, copy or migration tool"
url="http://imapsync.lamiral.info"
arch="noarch"
......@@ -10,7 +10,7 @@ license="custom"
depends="perl-digest-hmac perl-authen-ntlm perl-io-compress perl-data-dumper
perl-data-uniqid perl-digest-md5 perl-file-copy-recursive perl-io-socket-inet6
perl-io-socket-ssl perl-io-tee perl-mail-imapclient perl-parse-recdescent
perl-term-readkey perl-test-pod perl-test-tester perl-unicode-string perl-uri
perl-term-readkey perl-test-pod perl-test-simple perl-unicode-string perl-uri
perl-test-mockobject perl-readonly perl-json-webtoken"
makedepends="perl-module-scandeps perl-par-packer"
subpackages="$pkgname-doc"
......
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libplist
pkgver=1.12
pkgver=2.0.0
pkgrel=0
pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
url="http://libimobiledevice.org/"
......@@ -50,6 +50,4 @@ cxx() {
mv "$pkgdir"/usr/lib/*++.so.* "$subpkgdir"/usr/lib/
}
md5sums="8b04b0f09f2398022dcd4fba75012997 libplist-1.12.tar.bz2"
sha256sums="0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be libplist-1.12.tar.bz2"
sha512sums="8af40d8f457ca9a8a9061e9429698c696200714cc05dcbe981e900106c52cd5222edb9dd8d8976bccd0c8997508ed14fb2e10f0ed29383f2ad4f7c5eb7eec0b3 libplist-1.12.tar.bz2"
sha512sums="81508bf6773483528816725c3b5b868563b84fd7810999404072e5ea9efa7fc9f11ef997f32208e4421aa26b15edd0c65f87c67c1472e8c4e356f1e9fe7740ee libplist-2.0.0.tar.bz2"
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer:
pkgname=libreoffice
pkgver=5.2.3.3
pkgrel=1
pkgver=5.2.7.2
pkgrel=0
pkgdesc="LibreOffice - Meta package for the full office suite"
url="http://www.libreoffice.org/"
arch="all"
......@@ -40,6 +40,11 @@ source="http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice
fix-includes.patch
"
# secfixes:
# 5.2.7.2-r0:
# - CVE-2017-7870
# - CVE-2016-10327
languages=""
add_lang() {
local pkglang="${3:-$1}"
......@@ -317,23 +322,23 @@ writer() {
_split writer
}
md5sums="6177d8be5ca358929277a19292cae36d libreoffice-5.2.3.3.tar.xz
113eaf27048a8d2443852b917b03988c libreoffice-dictionaries-5.2.3.3.tar.xz
2346cacee8b4e797ba23765b748cf3ae libreoffice-translations-5.2.3.3.tar.xz
md5sums="f7db230dbe8cabaca1d2e8d4fb53e235 libreoffice-5.2.7.2.tar.xz
7fe320b26772ef1d0a239b1f01b6596f libreoffice-dictionaries-5.2.7.2.tar.xz
42df3d18baba5f7449cef20b69545c1b libreoffice-translations-5.2.7.2.tar.xz
ce12af00283eb90d9281956524250d6e ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
bfde50b1b04c715cd172be03a204521f linux-musl.patch
1cff63a520d1b037edddf1b4de4799dc fix-execinfo.patch
c6fc4d38ef1bab69f3570a0d087b4c52 fix-includes.patch"
sha256sums="a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 libreoffice-5.2.3.3.tar.xz
c40ac3a1381c3c6e8281df1b7d9eb5f99db794a32012e45762b0847b520529a5 libreoffice-dictionaries-5.2.3.3.tar.xz
8401e51c4b91cd47f103ba09519f0b5b9213561b7d6296ff5bdc2d1622950a48 libreoffice-translations-5.2.3.3.tar.xz
sha256sums="106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d libreoffice-5.2.7.2.tar.xz
791a14af2057d512ada1322d2c43c4d611ce03425af318716245e02d1d7944b0 libreoffice-dictionaries-5.2.7.2.tar.xz
89744dc0f0924a2f9c96d8d3e4ae44e7c3770c30d8d4ba35a7ae5ac5b28bf7aa libreoffice-translations-5.2.7.2.tar.xz
3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
fd0778cfd18b034a415a8966f7a3d8437c3f2ba1c6cfde8220ba663261b9c67f linux-musl.patch
7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 fix-execinfo.patch
51052d983eeea85d8d71385e4eeda61b6a8746854fe046b9a91e12c013d9ed89 fix-includes.patch"
sha512sums="8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 libreoffice-5.2.3.3.tar.xz
f618f88f45a9c9c526029030922427f9bfa73e35d452fdd1821690ba361f8656106556d94427f328066905f0ac7dcd761f384eba7feaf61a00e4828d5b97de98 libreoffice-dictionaries-5.2.3.3.tar.xz
939246f7c96799a0b5a4f6496b68ba9b941b6ef6691418a887cabaffd7fc19408b5a2d8b12b850c6a02c838ffd29190e63a50f23cf168602bb51b1b10e0a427c libreoffice-translations-5.2.3.3.tar.xz
sha512sums="f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f libreoffice-5.2.7.2.tar.xz
1f36ea01e94a26ecaf4070e8171687e2317d89e50c9c5bec0ef67fecca275dc237ef8ce83a23249090c691d30ce14975692e579a4488f46a6a326ef0249a196b libreoffice-dictionaries-5.2.7.2.tar.xz
4736b171afc778aa1087abbfdd5a3f7abf035c96a0916f79b13bbce67ecdd013da7ecdd2525807af9e1306bd9316dec94c2e46921a09dd8ce693bcf059f73eac libreoffice-translations-5.2.7.2.tar.xz
2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
6abfd9c6cf1917e9ee89695086013c94f5ec68f9732ad60faeeaabe6f3765f5ff19df575a3ef0098d6dd6ba3c76369cec871770396f5cd84829031c3e38485a8 linux-musl.patch
567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 fix-execinfo.patch
......
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mbedtls
pkgver=2.4.1
pkgver=2.4.2
pkgrel=0
pkgdesc="Light-weight cryptographic and SSL/TLS library"
url="https://tls.mbed.org/"
......@@ -12,8 +12,12 @@ makedepends="cmake perl"
subpackages="$pkgname-static $pkgname-dev $pkgname-utils"
source="$pkgname-$pkgver.tar.gz::https://github.com/ARMmbed/$pkgname/archive/$pkgname-$pkgver.tar.gz
verbose-testsuite.patch"
builddir="$srcdir/$pkgname-$pkgname-$pkgver"
# secfixes:
# 2.4.2-r0:
# - CVE-2017-2784
build() {
cd "$builddir"
......@@ -45,9 +49,5 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
md5sums="a4494630e2c2e3705238526d51428971 mbedtls-2.4.1.tar.gz
8136afec9a4503c0087fa93eb1920bd9 verbose-testsuite.patch"
sha256sums="0c85fe59e1f0426b1c8f17efdc0c41bd531828b6cff746c392beb53c774af4cb mbedtls-2.4.1.tar.gz
21460d566f678f76bef8c2895e6c93d8a23792f6481aed5853dc63daf8cfcbaa verbose-testsuite.patch"
sha512sums="c452ec701c90bca236be1fbacb728036a01eca257c9df8b0d738e02f4a3570183e34ae23221ca61933dd34e42ca7659bae9ce5de0a6fdd870e77c4b7154d3688 mbedtls-2.4.1.tar.gz
sha512sums="39ab068ffad99afe228749fc7f69a02a8c79f0fdb73e2dbcde2e97f737338030e2fb8507e9d1cb866429e89b255197a2225607d6645421d31d7f2ccb65bfc04f mbedtls-2.4.2.tar.gz
1a0f0c8c794f8aab2a050b660e86f3cba293fcd4d0ffba9a1a1b8fd88f631d68fe194256495ed584d13e577c577829f0bbe821ffaf11165163b5a78c9d68efe8 verbose-testsuite.patch"
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Contributor: Stefan Wagner <stw@bit-strickerei.de>
# Maintainer: Stefan Wagner <stw@bit-strickerei.de>
pkgname=munin
pkgver=2.0.25
pkgrel=1
pkgver=2.0.33
pkgrel=0
pkgdesc="A distributed monitoring/graphing tool"
url="http://munin-monitoring.org/"
arch="noarch"
......@@ -21,6 +22,11 @@ source="http://downloads.munin-monitoring.org/munin/stable/$pkgver/$pkgname-$pkg
$pkgname-node.initd
$pkgname.logrotate
$pkgname-node.logrotate"
# secfixes:
# 2.0.33-r0:
# - CVE-2017-6188
builddir="$srcdir/$pkgname-$pkgver"
build() {
......@@ -59,19 +65,19 @@ node() {
"$subpkgdir"/etc/init.d/$subpkgname
}
md5sums="b418a667ce42665557329a7ac3bd1b93 munin-2.0.25.tar.gz
md5sums="0d413df786d8f0b9862ecd794e739edf munin-2.0.33.tar.gz
4fce4fdc2d1c9d5f3f1d9b77afad6027 munin-config.patch
b474180bc97e870be7a80d1824fe1ceb munin.crond
a1bcfd3b2f696b2e56eff81fae5049d8 munin-node.initd
90ec26232e622fe3c708b519543bd937 munin.logrotate
f75f125ee68eb60347eb8d57c616eaa1 munin-node.logrotate"
sha256sums="6832bc5839d03639e4309178d9370697fc8a80a83d9b6653953f40161e949694 munin-2.0.25.tar.gz
sha256sums="1c6f994bf62d6dee89554efba0733b6f96d4130ba906162c32f77587088974c4 munin-2.0.33.tar.gz
ceec0ba906ffaaa97621bf11c537cca594c96e8f9c86f2aa254b55ca57546b97 munin-config.patch
f388434231dfd645be85654ac35a09315feac2f923e297f2aa8c11392e2ae4dc munin.crond
59269b33d23813969f7e9700cb3bb60c687fb502fcfed1ce23985e8b673d9da9 munin-node.initd
691b40eff51dafac2a5bef5a9c858f25dcb33e3633196ebfcc13353f203689d7 munin.logrotate
8d1d05ff21328f008acba361d2776651bd2cff44229f7ec570f03c525c9b6d46 munin-node.logrotate"
sha512sums="a29563cfef26b05237b3813b44b5582563f2f75477ae3c076540cfb4f3e83f89193bd05fd7eae208d9d1bae58aff75977cc2c5f4de81225f0cbb2ba2c41effa9 munin-2.0.25.tar.gz
sha512sums="aa6df8555dfd09585619376a4e9f20c2c6092e70076041ff3dcf987f6eab3caf2880ce32432f71f7b0493808d9e5dbc11e352aa636c39f22ad355409342feb70 munin-2.0.33.tar.gz
a1c691a4c5d7d2619ea6d2605c71a23eeaa65f9cf533477524927bc3244371e271a4dadf24e71d6630f3ea8d6ad56f26bed83330a22ff0573e67c5cafe66cf17 munin-config.patch
194b742b2ff8312c4c42a8a77d1d9a80bc53ced2343248c36f4229b0b0d366e898487fb5e415f1f5ccea7210a7a86e25de5e45193dbb5d26d2d6a195f0597642 munin.crond
4b2a49a7bcb64eef65eee3b77ce86ca2cd8afef681922fdb830cb382f334c07356576f1151f4423f066ba8ac1c2d9a51cf9ff3d4dd4b18a5c1e2c95abcd9a940 munin-node.initd
......
......@@ -3,11 +3,12 @@
pkgname=nodejs-current
# The current stable version, i.e. non-LTS.
pkgver=7.2.1
pkgrel=0
pkgrel=2
pkgdesc="JavaScript runtime built on V8 engine - current stable version"
url="http://nodejs.org/"
arch="all"
license="MIT"
depends="ca-certificates"
depends_dev="libuv"
# gold is needed for mksnapshot
makedepends="$depends_dev python2 openssl-dev zlib-dev libuv-dev linux-headers
......
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=one-context
pkgver=0.5.0
pkgver=0.5.4
pkgrel=0
pkgdesc="Contextualization scripts for OpenNebula guests"
url="https://github.com/jirutka/one-context/"
arch="noarch"
license="MIT"
depends="blkid"
makedepends=""
source="$pkgname-$pkgver.tar.gz::https://github.com/jirutka/$pkgname/archive/v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
build() {
return 0
}
package() {
cd "$builddir"
PREFIX=/usr DESTDIR="$pkgdir" DISTRO=alpine ./install
}
md5sums="c6fa5410cb9bade55964c49b7ee6a682 one-context-0.5.0.tar.gz"
sha256sums="2cdb56a18bdf47855aa17ac956caa4b5ee8f965eb5d61e1c9395d1cb2c79df6f one-context-0.5.0.tar.gz"
sha512sums="bef5d6d7b35350b20c94229fba3070e72c349a089f49d376a2a0e467a3b7f5c11a8a9baafd63cbc5d05b62ebd389d40fe71566147ee7598ac2d44a553f9a58a9 one-context-0.5.0.tar.gz"
sha512sums="5cc67450556ffd39708438a9ef53fe4a37bd2b0ab48665ab5bda01d29248937db8e20a92638d81b7cebc15335c4519b75f14d1ae17e8a6eb47213ca2f58f70c4 one-context-0.5.4.tar.gz"
This diff is collapsed.
--- icedtea-3.3.0/pax-mark-vm.in.orig 2017-02-09 09:42:32.652307034 +0000
+++ icedtea-3.3.0/pax-mark-vm.in 2017-02-09 09:43:46.043633914 +0000
@@ -9,17 +9,15 @@
}
if test "x@PAX_COMMAND@" != "x"; then
- if @PAX_COMMAND@ -m "${JDK}"/bin/java; then
for paxable in `list_paxables "${JDK}"/bin/* "${JDK}"/jre/bin/*`; do
echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
- @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
+ if ! @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"; then
+ if test "x${FAIL_ON_ERROR}" = "xtrue"; then
+ echo "ERROR: Could not apply PaX markings to files in ${JDK}";
+ exit 1;
+ else
+ echo "WARNING: Could not apply PaX markings to files in ${JDK}";
+ fi
+ fi
done
- else
- if test "x${FAIL_ON_ERROR}" = "xtrue"; then
- echo "ERROR: Could not apply PaX markings to files in ${JDK}";
- exit 1;
- else
- echo "WARNING: Could not apply PaX markings to files in ${JDK}";
- fi
- fi
fi
--- openjdk.orig/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
+++ openjdk/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
@@ -110,11 +110,19 @@
// it because the volatile registers are not needed to make setcontext() work.
// Hopefully it was zero'd out beforehand.
guarantee(uc->uc_mcontext.regs != NULL, "only use ucontext_get_pc in sigaction context");
+#if defined(__GLIBC__) || defined(__UCLIBC__)
return (address)uc->uc_mcontext.regs->nip;
+#else // Musl
+ return (address)uc->uc_mcontext.gp_regs[32];
+#endif
}
intptr_t* os::Linux::ucontext_get_sp(ucontext_t * uc) {
+#if defined(__GLIBC__) || defined(__UCLIBC__)
return (intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/];
+#else // Musl
+ return (intptr_t*)uc->uc_mcontext.gp_regs[1/*REG_SP*/];
+#endif
}
intptr_t* os::Linux::ucontext_get_fp(ucontext_t * uc) {
@@ -213,7 +221,11 @@
if (uc) {
address const pc = os::Linux::ucontext_get_pc(uc);
if (pc && StubRoutines::is_safefetch_fault(pc)) {
+#if defined(__GLIBC__) || defined(__UCLIBC__)
uc->uc_mcontext.regs->nip = (unsigned long)StubRoutines::continuation_for_safefetch_fault(pc);
+#else // Musl
+ uc->uc_mcontext.gp_regs[32] = (unsigned long)StubRoutines::continuation_for_safefetch_fault(pc);
+#endif
return true;
}
}
@@ -364,7 +376,11 @@
// continue at the next instruction after the faulting read. Returning
// garbage from this read is ok.
thread->set_pending_unsafe_access_error();
+#if defined(__GLIBC__) || defined(__UCLIBC__)
uc->uc_mcontext.regs->nip = ((unsigned long)pc) + 4;
+#else // Musl
+ uc->uc_mcontext.gp_regs[32] = ((unsigned long)pc) + 4;
+#endif
return true;
}
}
@@ -383,7 +399,11 @@
// continue at the next instruction after the faulting read. Returning
// garbage from this read is ok.
thread->set_pending_unsafe_access_error();
+#if defined(__GLIBC__) || defined(__UCLIBC__)
uc->uc_mcontext.regs->nip = ((unsigned long)pc) + 4;
+#else // Musl
+ uc->uc_mcontext.gp_regs[32] = ((unsigned long)pc) + 4;
+#endif
return true;
}
}
@@ -406,7 +426,11 @@
if (stub != NULL) {
// Save all thread context in case we need to restore it.
if (thread != NULL) thread->set_saved_exception_pc(pc);
+#if defined(__GLIBC__) || defined(__UCLIBC__)
uc->uc_mcontext.regs->nip = (unsigned long)stub;
+#else
+ uc->uc_mcontext.gp_regs[32] = (unsigned long)stub;
+#endif
return true;
}
@@ -564,6 +588,7 @@
ucontext_t* uc = (ucontext_t*)context;
st->print_cr("Registers:");
+#if defined(__GLIBC__) || defined(__UCLIBC__)
st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->nip);
st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->link);
st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.regs->ctr);
@@ -572,8 +597,18 @@
st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.regs->gpr[i]);
if (i % 3 == 2) st->cr();
}
+#else // Musl
+ st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[32]);
+ st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[36]);