...
 
Commits (635)
......@@ -4,6 +4,6 @@ install:
- sudo .travis/setup-alpine
script: |
source .travis/common.sh
alpine_run $ALPINE_USER .travis/build-pkgs
alpine_run $USER .travis/build-pkgs
notifications:
email: false
# vim: set ts=4:
readonly ALPINE_ROOT='/mnt/alpine'
readonly ALPINE_USER='alpine'
readonly CLONE_DIR="${CLONE_DIR:-$(pwd)}"
readonly MIRROR_URI='http://nl.alpinelinux.org/alpine/edge'
......
......@@ -4,16 +4,17 @@ set -eu
. "$(dirname "$0")"/common.sh
APK_TOOLS_URI='http://nl.alpinelinux.org/alpine/v3.5/main/x86_64/apk-tools-static-2.6.8-r2.apk'
APK_TOOLS_SHA256='e163b7d67e81946d67abb8bb1da3449792b52ad872d3b59967f90d445b50784f'
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
......
......@@ -12,9 +12,9 @@ mount --bind "$CLONE_DIR" "${ALPINE_ROOT}${CLONE_DIR}"
alpine_run <<-EOF
apk add alpine-sdk lua-aports
adduser -G users -s /bin/sh -D $ALPINE_USER
addgroup $ALPINE_USER abuild
addgroup $ALPINE_USER wheel
adduser -u $SUDO_UID -G users -s /bin/sh -D $SUDO_USER
addgroup $SUDO_USER abuild
addgroup $SUDO_USER wheel
echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/wheel
......@@ -28,6 +28,6 @@ alpine_run <<-EOF
EOF
# This key will not be used anywhere, just to make abuild happy...
alpine_run $ALPINE_USER <<-EOF
alpine_run $SUDO_USER <<-EOF
abuild-keygen -ain
EOF
# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
pkgname=bluefish
pkgver=2.2.9
pkgver=2.2.10
pkgrel=0
pkgdesc="Bluefish is an editor targeted towards programmers and webdevelopers"
url="http://bluefish.openoffice.nl/"
arch="all"
license="GPL"
depends=""
depends_dev=""
makedepends="libtool libxml2-dev python2-dev gtk+3.0-dev enchant-dev \
gucharmap-dev"
install=""
subpackages="$pkgname-lang $pkgname-doc"
source="http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
source="http://www.bennewitz.com/$pkgname/stable/source/$pkgname-$pkgver.tar.bz2"
builddir=${srcdir}/${pkgname}-${pkgver}
_builddir=${srcdir}/${pkgname}-${pkgver}
prepare() {
local i
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
default_prepare
update_config_guess
}
build() {
cd "$_builddir"
./configure --prefix=/usr || return 1
cd "$builddir"
./configure --prefix=/usr
make
}
package() {
cd "$_builddir"
cd "$builddir"
make DESTDIR="$pkgdir" install
}
md5sums="57ff0ad3ea8470848e20c7a94f03073b bluefish-2.2.9.tar.bz2"
sha256sums="5b717b563325bc6c2b6cb2700323c93eb08f914f204b322241d21744a079f7d0 bluefish-2.2.9.tar.bz2"
sha512sums="ef644b37907d308b908d508ad00069e48343cd240ca7703a20b4498eda73be1a97a6c07598f6e51d4fb1c0f2a380c86a274ccbbe046da01db6c4641e41e268ae bluefish-2.2.9.tar.bz2"
sha512sums="ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb bluefish-2.2.10.tar.bz2"
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
pkgname=cacti
pkgver=1.0.0
pkgrel=1
pkgver=1.1.19
pkgrel=0
pkgdesc="The complete rrdtool-based graphing solution"
url="http://www.cacti.net"
arch="noarch"
......@@ -131,15 +131,7 @@ _php() {
"$subpkgdir"/etc/$php/php-fpm.d/$pkgname.conf
}
md5sums="e711a305a12484623669e3c873126348 cacti-1.0.0.tar.gz
213c3aff8cf08438703ae5e544046eae cacti.crontab
8f28596ea23b68b0041680112ebab685 cacti.nginx.conf
b06ea26524a5fb30cfd083cfa0f235a8 cacti.php-fpm.conf"
sha256sums="180a23102af0415b961ef4d4181f93f49d40ebed36c5392ac988650d3753e693 cacti-1.0.0.tar.gz
9cfa7edec4b28722230b7b509cc420958b7864703752bb70c8376282bfc1c5a9 cacti.crontab
35bb157b53a11edcb923b91decac7e6468ede9376a109d73037d747165cc38e3 cacti.nginx.conf
f8a5697a4fd8c279d29d383c90b51f0c73311d3ac96d14953ec11f2f7d5bbdb2 cacti.php-fpm.conf"
sha512sums="9133bb3d34ee6a4fe94e8258ce76df1ceac5cc76ccc8a492ae9a1263cbfb765f88f169c2780f2b36c14d8df4607e8effaf448bcb632cd4171533d0f9842550b1 cacti-1.0.0.tar.gz
sha512sums="7fc173c869f43e58d249ef3610b79c001a00952ea871df720e7bfa35a1d4157444bd01050fdf3ced329d0cb7345b86276c1a334f6ea23dc832a67b4452fc61c8 cacti-1.1.19.tar.gz
70f47dbbca76489fc3a84452ee8065f9571ee627b3e346cd3c866501d723a609372c4fbd7e53c4bdcdb22439d876d78847f8902dfa43f3f66b2329639e795ab9 cacti.crontab
9b3fe765c6196c0e4988efaa7236d8a8b945725548371b4a0e2a371de374c9577a908d58dcef5a4e59e089ca923cfeb7c5ddea9ee983a5115239052cf9b8ab59 cacti.nginx.conf
695a5e8439ef0ed29068c87b1d711f66c5a24cf31c3c213784f83d6aef8608a07e99bfa2343a6487762572b6022926c3846f704494c7806e9a1aa2c49e18513b cacti.php-fpm.conf"
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=4
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
}
......@@ -3,7 +3,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=chicken
pkgver=4.12.0
pkgrel=1
pkgrel=5
pkgdesc="R5RS and R7RS compatible scheme compiler and interpreter"
url="http://call-cc.org/"
arch="all !ppc64le"
......@@ -13,10 +13,17 @@ depends_dev=""
makedepends="$depends_dev"
install=""
subpackages="$pkgname-doc $pkgname-libs $pkgname-dev $pkgname-feathers::noarch"
source="http://code.call-cc.org/releases/$pkgver/$pkgname-$pkgver.tar.gz"
source="http://code.call-cc.org/releases/$pkgver/$pkgname-$pkgver.tar.gz
CVE-2017-6949.patch
CVE-2017-9334.patch
"
# secfixes:
# 4.11.1:
# 4.12.0-r3:
# - CVE-2017-6949
# 4.12.0-r2:
# - CVE-2017-9334
# 4.11.1-r0:
# - CVE-2016-6830
# - CVE-2016-6831
......@@ -60,4 +67,6 @@ feathers() {
"$subpkgdir"/usr/share/chicken/ || return 1
}
sha512sums="190bdc9e53aa50e93419e2483fd5baf3e2ef3bebe4e605653f2aadd9b8bbc98b192cfbb64ab1c99eeefb13a7795757f013799963bfb775862d746ed5c93d602f chicken-4.12.0.tar.gz"
sha512sums="190bdc9e53aa50e93419e2483fd5baf3e2ef3bebe4e605653f2aadd9b8bbc98b192cfbb64ab1c99eeefb13a7795757f013799963bfb775862d746ed5c93d602f chicken-4.12.0.tar.gz
7709b6558c01490116cda11162833affa884afaed1ba2d34ee301f5439fad02a6550193266c38c3a93e88c19a680a7140eeafb23100f783979265a7c1a1eaf57 CVE-2017-6949.patch
7d594a6abaffe59a050305878ba9cc75cf588743407b2cc44e369fb22a94d42662bf8101bec93b60cacdc0046da5bc74ff1e8ac8d9e6aacfb280406cbbabce7c CVE-2017-9334.patch"
This diff is collapsed.
From 76bbb0c92c0a9e2cadac9796e55fdd2836424fdb Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Sun, 28 May 2017 12:37:44 +0200
Subject: [PATCH] Fix segmentation fault in "length" on improper lists.
This fixes #1375
---
runtime.c | 2 +-
tests/library-tests.scm | 6 ++++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/runtime.c b/runtime.c
index 86db413..7a513c2 100644
--- a/runtime.c
+++ b/runtime.c
@@ -5379,7 +5379,7 @@ C_regparm C_word C_fcall C_i_length(C_word lst)
}
}
- if(C_immediatep(slow) || C_block_header(lst) != C_PAIR_TAG)
+ if(C_immediatep(slow) || C_block_header(slow) != C_PAIR_TAG)
barf(C_NOT_A_PROPER_LIST_ERROR, "length", lst);
slow = C_u_i_cdr(slow);
diff --git a/tests/library-tests.scm b/tests/library-tests.scm
index cd2f6e9..9c7cab4 100644
--- a/tests/library-tests.scm
+++ b/tests/library-tests.scm
@@ -693,3 +693,9 @@ A
(assert (not (member "foo" '("bar"))))
(assert (not (member "foo" '())))
(assert-fail (member "foo" "foo"))
+
+
+;; length
+
+(assert-fail (length 1))
+(assert-fail (length '(x . y)))
--
2.1.4
# Maintainer: Christian Kampka <christian@kampka.net>
pkgname=docker-registry
pkgver=2.6.1
pkgrel=3
pkgver=2.6.2
pkgrel=0
pkgdesc="An implementation of the Docker Registry HTTP API V2 for use with docker 1.6+"
url="https://github.com/docker/distribution"
arch="x86 x86_64 ppc64le"
......@@ -64,6 +64,6 @@ package() {
"$pkgdir"/var/lib/$pkgname
}
sha512sums="a2175cb5ab049599e1bdae7026dc84e14b79883eca3ceaafda54497a1743103f125f65fa3922c003363dd86aa1422f539aff8b17746b9768968fef757e931c36 docker-registry-2.6.1.tar.gz
sha512sums="a091db2e15d7c1dc8cd39a40de5bb63cc1ead68e95dfaf6b3735a789adb87f146c03eff81f700e0059e5f6ffc43e6c3dd3358503697882cb080b991629f82c60 docker-registry-2.6.2.tar.gz
96100a4de311afa19d293a3b8a63105e1fcdf49258aa8b1752befd389e6b4a2b1f70711341ea011b450d4468bd37dbd07a393ffab3b9aa1b2213cf0fdd915904 docker-registry.initd
5a38f4d3f0ee5cd00c0a5ced744eb5b29b839da5921adea26c5de3eb88b6b2626a7ba29b1ab931e5f8fbfafbed8c94cb972a58737ec0c0a69cf515c32139e387 config-example.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/"
......@@ -33,6 +33,12 @@ build() {
cd "$_builddir"
}
# secfixes:
# 7.59-r0:
# - CVE-2018-7602
# 7.58-r0:
# - CVE-2018-7600
package() {
cd "$_builddir"
mkdir -p "$pkgdir"/var/lib/$pkgname \
......@@ -68,6 +74,4 @@ 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"
sha512sums="68f02b39d1a4658adc0f0046c22cc1059b68f952f9cd753f5a3e379cf93705be308b4727519e90d77a42437442daebaa78d76745954be4d40e1a5105c319069c drupal-7.59.tar.gz"
......@@ -2,7 +2,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
pkgname=emacs
pkgver=25.2
pkgver=25.3
pkgrel=0
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
arch="all !aarch64"
......@@ -139,7 +139,7 @@ gtk2() {
_subpackage gtk2
}
sha512sums="2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c emacs-25.2.tar.xz
sha512sums="1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f emacs-25.3.tar.xz
8898f309aeaf274366849bd5c56c8e2a1be94dfee2f01b20f1700bf26203f49b9600237e5090fc3d8eaad3ea246f803ffd493d0c04cb3512084a4e3bf58f8f5e gamedir.patch
d3a30a9bf7ef7349806a75ee919d6683a8000eb70f4c3040d149bd8911dc95b931a05c7cbf9f5b93176940ad87520dbb2ddef3b4136b0d5b140de0cdbc4b7a8f noaslr-dump.patch
4ec078f970c2d0ad9b082a613e7c7e64e40f37eaee96e67ab9b2e467595c74533f94ced74f6753e393a9c0ead88fad75adcfdd31be4295f5763292a6dd846fe8 musl.patch"
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=evince
pkgver=3.24.0
pkgver=3.24.1
pkgrel=0
pkgdesc="simple document viewer for GTK+"
url="http://projects.gnome.org/evince/"
......@@ -51,4 +51,4 @@ doc() {
}
sha512sums="b793c44b2976abe58461adfdb0b1874af8d6bafaf9b80a851d94b776f9d50f6a81774bcb5b35cd59a9ad3afeea9a8b88018aa85d670373c7c2fa9617407a09c4 evince-3.24.0.tar.xz"
sha512sums="205c1c9b68c9215bdcebf0c36841a35898e056ef8e56208db62c1fac04c4efad8fbc0800f410e3c94c526536adba5e8ead68bebec8f81061a3831789c5173726 evince-3.24.1.tar.xz"
......@@ -6,7 +6,7 @@
# Maintainer: Jesse Young <jlyo@jlyo.org>
pkgname=exim
pkgver=4.89
pkgrel=4
pkgrel=5
pkgdesc="A Message Transfer Agent"
url="http://www.exim.org/"
arch="all"
......@@ -21,6 +21,7 @@ install="exim.pre-install"
subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql
$pkgname-utils $pkgname-scripts::noarch $pkgname-doc"
source="ftp://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.xz
CVE-2017-1000369.patch
exim.Makefile
exim.confd
exim.initd
......@@ -28,6 +29,10 @@ source="ftp://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.xz
exim.gencert"
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
# 4.89-r5:
# - CVE-2017-1000369
prepare() {
default_prepare || return 1
......@@ -101,6 +106,7 @@ dbmdb() { _mv_ext dbmdb; }
dnsdb() { _mv_ext dnsdb; }
sha512sums="ce5faef3847a5baf1b4fec1ffe46ce7efaafb24e63bcc52a61f38e8312a88eccaa816c3947ba428bef3eed38b1e91e606f6ed07bc0a3e14c6a6ed0ecb41eb9fa exim-4.89.tar.xz
cffe895974e9f570e2f60583206e0c2865e9ca400636e5ed2117c531fc62b03753f41286565ee253c11610e61589275cb5235b34cae052b5dcc6e5c37fbc7ece CVE-2017-1000369.patch
e9524d3a2cc230b4ecb3b098f53247121b9582fc7807b1549c5a3fd54bb416b837c4e09476f2e01dca03d590a968c40bf90d4b6a9f8a4abad082fdec91916a0f exim.Makefile
bb6f5ead067af19ace661cc92bcd428da97570aedd1f9dc5b61a34e7e3fb3e028be6c96d51df73353bdfcaf69a3ee053fb03d245f868d63ebf518aa96ec82d66 exim.confd
8d0c594c5e3834ddd3a7743c025caf3f5c04f6ac17e25f2278e7a36b726150f0f8e36a1c76cd1a4b454edcb163181ee05ea40a6b61a0e9172c600e4808ccc80f exim.initd
......
From 65e061b76867a9ea7aeeb535341b790b90ae6c21 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Wed, 31 May 2017 23:08:56 +0200
Subject: [PATCH] Cleanup (prevent repeated use of -p/-oMr to avoid mem leak)
---
doc/doc-docbook/spec.xfpt | 3 ++-
src/src/exim.c | 19 +++++++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/src/exim.c b/src/src/exim.c
index 67583e584..88e119778 100644
--- a/src/src/exim.c
+++ b/src/exim.c
@@ -3106,7 +3106,14 @@ for (i = 1; i < argc; i++)
/* -oMr: Received protocol */
- else if (Ustrcmp(argrest, "Mr") == 0) received_protocol = argv[++i];
+ else if (Ustrcmp(argrest, "Mr") == 0)
+
+ if (received_protocol)
+ {
+ fprintf(stderr, "received_protocol is set already\n");
+ exit(EXIT_FAILURE);
+ }
+ else received_protocol = argv[++i];
/* -oMs: Set sender host name */
@@ -3202,7 +3209,15 @@ for (i = 1; i < argc; i++)
if (*argrest != 0)
{
- uschar *hn = Ustrchr(argrest, ':');
+ uschar *hn;
+
+ if (received_protocol)
+ {
+ fprintf(stderr, "received_protocol is set already\n");
+ exit(EXIT_FAILURE);
+ }
+
+ hn = Ustrchr(argrest, ':');
if (hn == NULL)
{
received_protocol = argrest;
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=firefox-esr
pkgver=52.1.2
pkgver=52.5.0
_pkgver=$pkgver
_xulver=$pkgver
pkgrel=0
pkgdesc="Firefox web browser - Extended Support Release"
url="https://www.mozilla.org/en-US/firefox/organizations/faq/"
arch="all !aarch64"
arch="all"
license="GPL LGPL MPL"
depends=""
depends_dev="
......@@ -229,7 +229,7 @@ dev() {
default_dev
}
sha512sums="76362738f6db82a41ff6af4e12a15a302068a5ce10d23739f29375f3279573d0ea43ecee9d2e46fce833a029e437efcfcceab9442c288560f476e0cff2ea9e1d firefox-52.1.2esr.source.tar.xz
sha512sums="fe724108ba538e590b87a5c1b817471d3cca9b038ba2755642e4d7b8ebb6174322be1fe074f24ef181946f9a027106b50b500d2fa541d8a99ef44905822eda18 firefox-52.5.0esr.source.tar.xz
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8 0002-Use-C99-math-isfinite.patch
09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5 fix-fortify-inline.patch
......
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Eivind Uggedal <eivind@uggedal.com>
pkgname=go
pkgver=1.8.1
pkgver=1.8.4
# This should be the latest commit on the corresponding release branch
_toolsver="5682db0e919ed9cfc6f52ac32e170511a106eb3b"
pkgrel=0
......@@ -167,7 +167,7 @@ _crosspkg() {
"$subpkgdir"/usr/lib/go/pkg/ || return 1
}
sha512sums="f01fe7b35ac23101610f6fc169b88dafe2edc49b3b044d5d0aff771b05dcb2c8d2e7a5090ed6dbe67f861e78e792ace32e209ed464399ca02dcd186b13ec8037 go1.8.1.src.tar.gz
343fca47f250278b22df1c1cd92cce91e01009043d05d8ccce095e4386fa0f5ca8ccaa58232635332c7288ceca9d2a240f774f8bb3b08129a681a582cba60248 go-tools-1.8.1.tar.gz
13cd386c38875b951da4057586007f3c67503dc79ddf57befbf763af85ec2cd2a2e6b00614450c179c93f1f8747ee7456ee412adccd08a5f115b33812598a148 default-buildmode-pie.patch
ab06554c1c37fda2bf0112d7343f253111911e07cdd77805e9811aaabe298980a0fac60f6294e68b95df017ab40d73655874e3d1d230c54181d6ffc7639e3ed6 set-external-linker.patch"
sha512sums="7b1954374c3f87b48246a58906bb2c50d6cf24fbb6e64abed2aef373ac22b35bdfe60e3e9b609e4daba8a91181abba2d62da1aa427f3c3c3bc6944939a40c156 go1.8.4.src.tar.gz
343fca47f250278b22df1c1cd92cce91e01009043d05d8ccce095e4386fa0f5ca8ccaa58232635332c7288ceca9d2a240f774f8bb3b08129a681a582cba60248 go-tools-1.8.4.tar.gz
9857c71108652b8907117abf0b41ded5e332bcf864320235aadbf3a7b6afbfc0e5051f91fe143f0654b4c8d6fe9adbe7d22ca2ce50cd75c0ab7a050dfb437773 default-buildmode-pie.patch
6b36f3780ab10e5c4902473a8ab5c0417220ece584b537517e9e60979bdc5a548ed14dd2546605392c89ec5ea6691769d337d34e2e19b92eba5bbca1898f4ada set-external-linker.patch"
......@@ -4,7 +4,7 @@
ldBuildmode = "c-shared"
case "default":
switch platform {
+ case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le",
+ case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/s390x",
+ "android/amd64", "android/arm", "android/arm64", "android/386":
- case "android/arm", "android/arm64", "android/amd64", "android/386":
codegenArg = "-shared"
......
......@@ -72,7 +72,7 @@ index 6eff2f4..1f3c0be 100644
// TODO(austin): ABI v1 uses /usr/lib/ld.so.1
- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"
+ ld.Thearch.Linuxdynld = "/lib64/ld-musl-ppc64le.so.1"
+ ld.Thearch.Linuxdynld = "/lib/ld-musl-powerpc64le.so.1"
ld.Thearch.Freebsddynld = "XXX"
ld.Thearch.Openbsddynld = "XXX"
......
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=graphicsmagick
pkgver=1.3.25
pkgrel=1
pkgver=1.3.27
pkgrel=0
pkgdesc="Image processing system"
url="http://www.graphicsmagick.org/"
arch="all"
license="MIT"
depends=""
depends_dev="jasper-dev libpng-dev tiff-dev libxml2-dev libwmf-dev"
makedepends="$depends_dev libtool libltdl"
install=""
makedepends="jasper-dev libpng-dev tiff-dev libxml2-dev libwmf-dev libtool libltdl"
subpackages="$pkgname-dev $pkgname-doc"
source="http://downloads.sourceforge.net/$pkgname/$pkgname/$pkgver/GraphicsMagick-$pkgver.tar.xz"
options="libtool"
options="libtool !check"
builddir="$srcdir"/GraphicsMagick-$pkgver
# security fixes:
# 1.3.27-r0:
# - CVE-2017-11102
# - CVE-2017-14314
# - CVE-2017-14504
# - CVE-2017-14733
# - CVE-2017-14994
# - CVE-2017-14997
# - CVE-2017-15930
# - CVE-2017-14649
# 1.3.25-r4:
# - CVE-2017-13775
# - CVE-2017-13776
# - CVE-2017-13777
# 1.3.25-r3:
# - CVE-2017-11642
# - CVE-2017-11722
# - CVE-2017-12935
# - CVE-2017-12936
# - CVE-2017-12937
# - CVE-2017-13063
# - CVE-2017-13064
# 1.3.25-r2:
# - CVE-2017-11403
build() {
cd "$builddir"
./configure \
......@@ -32,16 +53,13 @@ build() {
--with-modules \
--with-threads \
--with-gs-font-dir=/usr/share/fonts/Type1 \
--with-quantum-depth=16 \
|| return 1
make || return 1
--with-quantum-depth=16
make
}
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
make DESTDIR="$pkgdir" install
}
md5sums="6eed966b22588fb068442319a8aa17f6 GraphicsMagick-1.3.25.tar.xz"
sha256sums="d64bfa52d2e0730eff9ce3ed51d4fc78dbb68e2adaa317b2bb3c56e6ee61ac9f GraphicsMagick-1.3.25.tar.xz"
sha512sums="d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8 GraphicsMagick-1.3.25.tar.xz"
sha512sums="27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c GraphicsMagick-1.3.27.tar.xz"
diff -r b24f2a9b0dd7 -r d0a76868ca37 coders/png.c
--- a/coders/png.c Mon Jul 10 11:31:05 2017 -0400
+++ b/coders/png.c Mon Jul 10 12:40:55 2017 -0400
@@ -5161,8 +5161,8 @@
if (image == (Image *) NULL)
{
+ CloseBlob(previous);
DestroyImageList(previous);
- CloseBlob(previous);
MngInfoFreeStruct(mng_info,&have_mng_structure);
return((Image *) NULL);
}
# HG changeset patch
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
# Date 1500758975 18000
# Node ID 29550606d8b9bf74f9aea0637d11d19fe706871b
# Parent 30cd2b31f7e045de4861b102e3f8d83db579bc7a
MAP: Fix null pointer dereference or SEGV if input is not colormapped.
diff -r 30cd2b31f7e0 -r 29550606d8b9 coders/map.c
--- a/coders/map.c Sat Jul 22 15:40:00 2017 -0500
+++ b/coders/map.c Sat Jul 22 16:29:35 2017 -0500
@@ -18,7 +18,7 @@
% M M A A P %
% %
% %
-% Read/Write Image Colormaps As An Image File %
+% Read/Write Image Colormaps And Image File %
% %
% %
% Software Design %
@@ -349,16 +349,17 @@
/*
Allocate colormap.
*/
- if (!IsPaletteImage(image,&image->exception))
- (void) SetImageType(image,PaletteType);
+ if (SetImageType(image,PaletteType) == MagickFail)
+ ThrowMAPWriterException(ResourceLimitError,MemoryAllocationFailed,image);
packet_size=image->depth > 8 ? 2 : 1;
- pixels=MagickAllocateMemory(unsigned char *,image->columns*packet_size);
+ pixels=MagickAllocateArray(unsigned char *,image->columns,packet_size);
if (pixels == (unsigned char *) NULL)
ThrowMAPWriterException(ResourceLimitError,MemoryAllocationFailed,image);
packet_size=image->colors > 256 ? 6 : 3;
- colormap=MagickAllocateMemory(unsigned char *,packet_size*image->colors);
+ colormap=MagickAllocateArray(unsigned char *,packet_size,image->colors);
if (colormap == (unsigned char *) NULL)
ThrowMAPWriterException(ResourceLimitError,MemoryAllocationFailed,image);
+
/*
Write colormap to file.
*/
# HG changeset patch
# User Glenn Randers-Pehrson <glennrp+bmo@gmail.com>
# Date 1501028322 14400
# Node ID f423ba88ca4ed01b7143520a7e00c360049aa823
# Parent d1e56efb0162a836707d41182d6d658d1cad49e6
coders/png.c: Fixed writer bug due to missing brackets
diff -r d1e56efb0162 -r f423ba88ca4e coders/png.c
--- a/coders/png.c Tue Jul 25 19:38:39 2017 -0400
+++ b/coders/png.c Tue Jul 25 20:18:42 2017 -0400
@@ -7125,12 +7125,14 @@
png_error(ping, "Could not allocate trans_alpha");
for (i=0; i<(int) number_colors; i++)
- if (trans_alpha[i] == 256)
- ping_trans_alpha[i]=255;
- else
- ping_trans_alpha[i]=(png_byte) trans_alpha[i];
- (void) LogMagickEvent(CoderEvent, GetMagickModule(),
- " Alpha[%d]=%d",(int) i, (int) trans_alpha[i]);
+ {
+ if (trans_alpha[i] == 256)
+ ping_trans_alpha[i]=255;
+ else
+ ping_trans_alpha[i]=(png_byte) trans_alpha[i];
+ (void) LogMagickEvent(CoderEvent, GetMagickModule(),
+ " Alpha[%d]=%d",(int) i, (int) trans_alpha[i]);
+ }
}
}
# HG changeset patch
# User Glenn Randers-Pehrson <glennrp+bmo@gmail.com>
# Date 1501123201 14400
# Node ID cd699a44f188acf23493c969ef2d3f9fa7c8f8df
# Parent be898b7c97bd855fc6fa0cef983faae916bd0c93
Reject MNG with too-large dimensions (over 65535)
diff -r be898b7c97bd -r cd699a44f188 coders/png.c
--- a/coders/png.c Wed Jul 26 19:47:56 2017 -0500
+++ b/coders/png.c Wed Jul 26 22:40:01 2017 -0400
@@ -4084,11 +4084,17 @@
mng_info->image=image;
}
- if ((mng_info->mng_width > 65535L) || (mng_info->mng_height
- > 65535L))
- (void) ThrowException(&image->exception,ImageError,
- WidthOrHeightExceedsLimit,
- image->filename);
+ if ((mng_info->mng_width > 65535L) ||
+ (mng_info->mng_height > 65535L))
+ {
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " MNG width or height is too large: %lu, %lu",
+ mng_info->mng_width,mng_info->mng_height);
+ MagickFreeMemory(chunk);
+ ThrowReaderException(CorruptImageError,
+ ImproperImageHeader,image);
+ }
+
FormatString(page_geometry,"%lux%lu+0+0",mng_info->mng_width,
mng_info->mng_height);
mng_info->frame.left=0;
# HG changeset patch
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
# Date 1501116476 18000
# Node ID be898b7c97bd855fc6fa0cef983faae916bd0c93
# Parent 6a632982c866f36dbad87e4ab953e08a290eaa8b
WMF: Eliminate use of already freed heap data in error reporting path.
diff -r 6a632982c866 -r be898b7c97bd coders/wmf.c
--- a/coders/wmf.c Tue Jul 25 20:11:16 2017 -0500
+++ b/coders/wmf.c Wed Jul 26 19:47:56 2017 -0500
@@ -2719,8 +2719,8 @@
if(image->exception.severity != UndefinedException)
ThrowException2(exception,
CoderWarning,
- ddata->image->exception.reason,
- ddata->image->exception.description);
+ image->exception.reason,
+ image->exception.description);
if(logging)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"leave ReadWMFImage()");
# HG changeset patch
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
# Date 1501555785 18000
# Node ID 95d00d55e978dec3e1bb4c288dbc210b5cc8bea1
# Parent 921a31d31ea85405b54771941e195782e50e589d
SUN: Fix heap read overflow while indexing colormap in bilevel decoder
diff -r 921a31d31ea8 -r 95d00d55e978 coders/sun.c
--- a/coders/sun.c Mon Jul 31 09:35:26 2017 -0400
+++ b/coders/sun.c Mon Jul 31 21:49:45 2017 -0500
@@ -1,5 +1,5 @@
/*
-% Copyright (C) 2003-2015 GraphicsMagick Group
+% Copyright (C) 2003-2017 GraphicsMagick Group
% Copyright (C) 2002 ImageMagick Studio
% Copyright 1991-1999 E. I. du Pont de Nemours and Company
%
@@ -577,6 +577,7 @@
for (bit=7; bit >= 0; bit--)
{
index=((*p) & (0x01 << bit) ? 0x01 : 0x00);
+ VerifyColormapIndex(image,index);
indexes[x+7-bit]=index;
q[x+7-bit]=image->colormap[index];
}
@@ -587,6 +588,7 @@
for (bit=7; bit >= (long) (8-(image->columns % 8)); bit--)
{
index=((*p) & (0x01 << bit) ? 0x01 : 0x00);
+ VerifyColormapIndex(image,index);
indexes[x+7-bit]=index;
q[x+7-bit]=image->colormap[index];
}
diff --git a/coders/svg.c b/coders/svg.c
index 82c87c3..2f88e37 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -266,11 +266,12 @@ static char **GetStyleTokens(void *context,const char *text,size_t *number_token
char
**tokens;
- register const char
+ const char
*p,
*q;
- register size_t
+ size_t
+ alloc_tokens,
i;
SVGInfo
@@ -278,21 +279,27 @@ static char **GetStyleTokens(void *context,const char *text,size_t *number_token
svg_info=(SVGInfo *) context;
*number_tokens=0;
+ alloc_tokens=0;
if (text == (const char *) NULL)
return((char **) NULL);
/*
Determine the number of arguments.
+
+ style="fill: red; stroke: blue; stroke-width: 3"
*/
for (p=text; *p != '\0'; p++)
if (*p == ':')
- (*number_tokens)+=2;
- tokens=MagickAllocateMemory(char **,(*number_tokens+2)*sizeof(*tokens));
+ alloc_tokens+=2;
+ if (alloc_tokens == 0)
+ return((char **) NULL);
+ tokens=MagickAllocateMemory(char **,(alloc_tokens+2)*sizeof(*tokens));
if (tokens == (char **) NULL)
{
ThrowException3(svg_info->exception,ResourceLimitError,
MemoryAllocationFailed,UnableToConvertStringToTokens);
return((char **) NULL);
}
+ (void) memset(tokens,0,(alloc_tokens+2)*sizeof(*tokens));
/*
Convert string to an ASCII list.
*/
@@ -303,14 +310,36 @@ static char **GetStyleTokens(void *context,const char *text,size_t *number_token
if ((*q != ':') && (*q != ';') && (*q != '\0'))
continue;
tokens[i]=AllocateString(p);
+ if (tokens[i] == NULL)
+ {
+ ThrowException3(svg_info->exception,ResourceLimitError,
+ MemoryAllocationFailed,UnableToConvertStringToTokens);
+ break;
+ }