~alpine/aports

12

[alpine-aports] [PATCH 1/13] main/ckbcomp: update new package

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317110855.23575-1-tmhoang@flatglobe.org>
Sender timestamp
1489748935
DKIM signature
missing
Download raw message
Patch: +2 -4
Old package was removed

---
 main/ckbcomp/APKBUILD | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index e6942e5e33..ad8fbc4e7e 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ckbcomp
pkgver=1.146
pkgver=1.163
pkgrel=1
pkgdesc="Compile a XKB keyboard description to a keymap"
url="http://anonscm.debian.org/cgit/d-i/console-setup.git/"
@@ -23,6 +23,4 @@ package() {
	install -m755 Keyboard/ckbcomp ${pkgdir}/usr/bin/
}

md5sums="eb5e7e08612cb6a75e2f88b52666f3a2  console-setup_1.146.tar.xz"
sha256sums="578ef609fc82b532ac712ac8e8c93bd4a5ff909c3d55268624167e0e0cae39f0  console-setup_1.146.tar.xz"
sha512sums="41a5872c663fc2f44fa7bb022345966acb79d86d249e8999d67351b1fc59fb0005b2ac9e8d9d49e3c007aed4504114b29e4847afd55e643bbae6ea1de523c8c7  console-setup_1.146.tar.xz"
sha512sums="24beeab5c8d14e2176a39bc1d67008fc9a294c5fac0c10cd109c4902924cb8b605fb6ff900255d544f4e411a3702dbc58f51453f0fa92b35bb57f6df7580f307  console-setup_1.163.tar.xz"
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 2/13] main/clamav: fix bug

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317110956.23630-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489748996
DKIM signature
missing
Download raw message
Patch: +23 -0
zlib 1.2.11 was mistaken as 1.2.1

---
 main/clamav/APKBUILD             |  2 ++
 main/clamav/fix-zlib-1.2.1.patch | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 main/clamav/fix-zlib-1.2.1.patch

diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index 4ddf77575a..ae2ef5aedc 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -25,6 +25,7 @@ source="http://www.clamav.net/downloads/production/$pkgname-$pkgver.tar.gz
	freshclam.confd
	clamd.logrotate
	freshclam.logrotate
	fix-zlib-1.2.1.patch
	"

_builddir="$srcdir/$pkgname-$pkgver"
@@ -204,4 +205,5 @@ ed81be79bf9a25eec071312252121cc76c96838407377b75077bf94922055f1de99f327982ac4dcc
00daed8afb67a6e4a29893340246c8840cce970dd9103d26557ecdd26ef60b12551d2291c214fc657faaaa339484052079347411b0cad65e3a33ece56d57cf16  freshclam.initd
ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08  freshclam.confd
3ae493dd1610a819402c015f6b8c0f080f926b72dc43d2bded60030bf6a55040e4b88e0f64d3aae299dc1133d7e1b89855e7346b4665a64e8b82592f7b75cf6a  clamd.logrotate
d555e40d6424b47afc6375d42379d0798963168eb47dcefaf5d9f5e429827af7cd7461792f3af3875754a97cfc259d5bb5a1fbe254489e43f4135cfa6f90a5b0  fix-zlib-1.2.1.patch
30cff378bc28c76b795e00c92ae5ee623f3abe4a19bed61dd8403c96e72658bb02b7f040d26a6258104af754464d25ea7d9646918c4b47d2ba9a8cbf4687056c  freshclam.logrotate"
diff --git a/main/clamav/fix-zlib-1.2.1.patch b/main/clamav/fix-zlib-1.2.1.patch
new file mode 100644
index 0000000000..8ab4db0728
--- /dev/null
+++ b/main/clamav/fix-zlib-1.2.1.patch
@@ -0,0 +1,21 @@

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 9bcd60b..4a3359a 100755
--- a/configure
+++ b/configure
@@ -18718,7 +18718,7 @@ else
 
     vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
     if test -z "$vuln"; then
-	vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
+	vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h`
     fi
 
     if test -n "$vuln"; then
-- 
2.11.1

-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 3/13] main/iptraf-ng,virtinst: update new source

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317110958.23671-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489748998
DKIM signature
missing
Download raw message
Patch: +2 -6
Fedorahosted stopped service

---
 main/iptraf-ng/APKBUILD | 4 +---
 main/virtinst/APKBUILD  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/main/iptraf-ng/APKBUILD b/main/iptraf-ng/APKBUILD
index 2152128b2a..8a2eac3013 100644
--- a/main/iptraf-ng/APKBUILD
+++ b/main/iptraf-ng/APKBUILD
@@ -11,7 +11,7 @@ depends=""
makedepends="ncurses-dev linux-headers"
install=""
subpackages="$pkgname-doc"
source="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz"
source="http://pkgs.fedoraproject.org/repo/pkgs/iptraf-ng/$pkgname-$pkgver.tar.gz/de27cfeeede96e2acfb0edc8439b034a/$pkgname-$pkgver.tar.gz"

_builddir="$srcdir"/iptraf-ng-$pkgver
prepare() {
@@ -38,6 +38,4 @@ package() {
	make DESTDIR="$pkgdir" install || return 1
}

md5sums="de27cfeeede96e2acfb0edc8439b034a  iptraf-ng-1.1.4.tar.gz"
sha256sums="79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09  iptraf-ng-1.1.4.tar.gz"
sha512sums="8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774  iptraf-ng-1.1.4.tar.gz"
diff --git a/main/virtinst/APKBUILD b/main/virtinst/APKBUILD
index 1f63b9c2a2..93d984389b 100644
--- a/main/virtinst/APKBUILD
+++ b/main/virtinst/APKBUILD
@@ -10,7 +10,7 @@ depends="libvirt python2 py-urlgrabber py-libxml2 py-libvirt"
makedepends="gettext-dev libvirt-dev python2-dev grep"
install=""
subpackages="$pkgname-doc $pkgname-lang"
source="https://fedorahosted.org/released/python-virtinst/${pkgname}-${pkgver}.tar.gz"
source="http://pkgs.fedoraproject.org/repo/pkgs/python-virtinst/$pkgname-$pkgver.tar.gz/0be36b08bb8b61eb9d75f0885eacc173/$pkgname-$pkgver.tar.gz"

_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
@@ -27,6 +27,4 @@ package() {
	cd "$_builddir"
	python2 ./setup.py install --root=$pkgdir
}
md5sums="0be36b08bb8b61eb9d75f0885eacc173  virtinst-0.600.4.tar.gz"
sha256sums="6e377a7512eaaecd96f8a91998f2db2feaa6d722c132103f44d1b6447c54b49c  virtinst-0.600.4.tar.gz"
sha512sums="59a0ab1cc9080ce55b857853602311e8573b7339ceb540bffecd19ae1e41a30248058897fbc257fd264c8592bac23e09730927a68d351181e68e919270018536  virtinst-0.600.4.tar.gz"
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 4/13] main/lua-crypto: fix bug

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111000.23716-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749000
DKIM signature
missing
Download raw message
Patch: +26 -6
lua5.1 LUA_CFLAGS is blank thus fails configure script

---
 main/lua-crypto/APKBUILD                            | 11 +++++------
 .../lua5.1-blank-LUA_CFLAGS-fails-configure.patch   | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 main/lua-crypto/lua5.1-blank-LUA_CFLAGS-fails-configure.patch

diff --git a/main/lua-crypto/APKBUILD b/main/lua-crypto/APKBUILD
index c706a5434b..19316930fe 100644
--- a/main/lua-crypto/APKBUILD
+++ b/main/lua-crypto/APKBUILD
@@ -8,14 +8,15 @@ url="http://mkottman.github.io/luacrypto/"
arch="all"
license="MIT/X11"
depends=
makedepends="libressl-dev"
makedepends="libressl-dev lua-dev"
install=
subpackages="$pkgname-dev $pkgname-doc"
for _v in $_luaversions; do
	makedepends="$makedepends lua$_v-dev"
	subpackages="$subpackages lua$_v-crypto:split_${_v/./_}"
done
source="luacrypto-$pkgver.tar.gz::https://github.com/mkottman/luacrypto/archive/$pkgver.tar.gz"
source="luacrypto-$pkgver.tar.gz::https://github.com/mkottman/luacrypto/archive/$pkgver.tar.gz
	lua5.1-blank-LUA_CFLAGS-fails-configure.patch"

_builddir="$srcdir"/luacrypto-$pkgver

@@ -71,7 +72,5 @@ for _v in $_luaversions; do
	eval "split_${_v/./_}() { _split $_v; }"
done


md5sums="07271929beec760a42eff012803490a1  luacrypto-0.3.2.tar.gz"
sha256sums="63c5d7e2539779039114335b9a8f149d63382c4db298d69e70488a0108143bb4  luacrypto-0.3.2.tar.gz"
sha512sums="4cb20d2cc348a11f140210dffb803629034c72cc7232590f4488f559d5c7233e0c41e56fcd0863959ac0b07e64c9aa79ea573e4126fdc11bc3f1b3b49d13343e  luacrypto-0.3.2.tar.gz"
sha512sums="4cb20d2cc348a11f140210dffb803629034c72cc7232590f4488f559d5c7233e0c41e56fcd0863959ac0b07e64c9aa79ea573e4126fdc11bc3f1b3b49d13343e  luacrypto-0.3.2.tar.gz
cca8745c5b46fa8b3adc237eb1d926c008b6d03637978568537da8c505479272f2b08bbcf1b016883eb783dd88759533aae5fd14fe3d5927b36f54074afdcd34  lua5.1-blank-LUA_CFLAGS-fails-configure.patch"
diff --git a/main/lua-crypto/lua5.1-blank-LUA_CFLAGS-fails-configure.patch b/main/lua-crypto/lua5.1-blank-LUA_CFLAGS-fails-configure.patch
new file mode 100644
index 0000000000..a6fb53832c
--- /dev/null
+++ b/main/lua-crypto/lua5.1-blank-LUA_CFLAGS-fails-configure.patch
@@ -0,0 +1,21 @@

---
 configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index eb01472..970eb8d 100755
--- a/configure
+++ b/configure
@@ -12331,6 +12331,8 @@ $as_echo_n "checking for LUA... " >&6; }
 
 if test -n "$LUA_CFLAGS"; then
     pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
+ elif test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua\""; } >&5
-- 
2.11.1

-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 5/13] main/lua-sqlite: fix bug

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111003.23757-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749003
DKIM signature
missing
Download raw message
Patch: +1 -1
It creates a lua5.x-sqlite.apk packages in REPO_DIR/all rather than 
REPO_DIR/$CARCH

---
 main/lua-sqlite/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/lua-sqlite/APKBUILD b/main/lua-sqlite/APKBUILD
index e6f88b9b5a..9e9b28aa1c 100644
--- a/main/lua-sqlite/APKBUILD
+++ b/main/lua-sqlite/APKBUILD
@@ -21,7 +21,7 @@ builddir="$srcdir"/$pkgname-$pkgver

for _v in $_luaversions; do
	makedepends="$makedepends lua$_v-dev"
	subpackages="$subpackages lua$_v-${pkgname#lua-}:_package:all"
	subpackages="$subpackages lua$_v-${pkgname#lua-}:_package"
done

prepare() {
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 6/13] main/minizip: update new package

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111005.23798-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749005
DKIM signature
missing
Download raw message
Patch: +2 -6
Old package was deleted

---
 main/minizip/APKBUILD | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/main/minizip/APKBUILD b/main/minizip/APKBUILD
index 90ba6e0324..ebd81477d7 100644
--- a/main/minizip/APKBUILD
+++ b/main/minizip/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=minizip
pkgver=1.2.10
pkgver=1.2.11
pkgrel=0
pkgdesc="a library for manipulation with files from .zip archives"
arch="all"
@@ -38,9 +38,5 @@ package() {
	make DESTDIR="$pkgdir" install || return 1
}

md5sums="d9794246f853d15ce0fcbf79b9a3cf13  zlib-1.2.10.tar.gz
778dc4d8a9455d8f35257c3a19bc24e5  zlib-1.2.8-minizip-include.patch"
sha256sums="8d7e9f698ce48787b6e1c67e6bff79e487303e66077e25cb9784ac8835978017  zlib-1.2.10.tar.gz
226d84018df7b7281b3b62df88a7d61cffcfc6c541895b453fe53662ce7ab2e5  zlib-1.2.8-minizip-include.patch"
sha512sums="5fa71052a418a0f2b345fce28af9941bbd1c6ee276ce506ab3092157f15776ee41f96bb1799657227513b852913f96ac52dae8122a437f34b43933ee48d63ee0  zlib-1.2.10.tar.gz
sha512sums="73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae  zlib-1.2.11.tar.gz
870bec30f994fb2ece41ab5a7f24de08daa5d0751744232f9971a345c186db98bd00bd04f466a8a3abc10b11c15f17461255fda630dd0a4eae9635b03b93b826  zlib-1.2.8-minizip-include.patch"
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 7/13] main/myrepo: update new package

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111007.23839-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749007
DKIM signature
missing
Download raw message
Patch: +5 -7
Old package was removed

---
 main/myrepos/APKBUILD | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/main/myrepos/APKBUILD b/main/myrepos/APKBUILD
index 50da6557f0..f905f647ee 100644
--- a/main/myrepos/APKBUILD
+++ b/main/myrepos/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=myrepos
pkgver=1.20160123
pkgrel=1
pkgver=1.20170129
pkgrel=0
pkgdesc="A multiple repository management tool"
url="https://github.com/joeyh/myrepos"
url="https://git.joeyh.name/git/myrepos.git"
arch="noarch"
license="GPL2+"
depends="perl git"
@@ -13,7 +13,7 @@ makedepends=""
replaces="mr"
install=""
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/joeyh/$pkgname/archive/$pkgver.tar.gz"
source="https://git.joeyh.name/index.cgi/myrepos.git/snapshot/myrepos-${pkgver}.tar.gz"

_builddir="$srcdir"/$pkgname-$pkgver
build() {
@@ -44,6 +44,4 @@ doc() {
    default_doc
}

md5sums="ab3891c9f542dcbb7ed7fb097bfa23b4  myrepos-1.20160123.tar.gz"
sha256sums="13d3b2c309d8130896e54456ae466763dc187433f737de12179f5e05cb63439c  myrepos-1.20160123.tar.gz"
sha512sums="ad22f0369530347d104815338f27f5b375b88f323ef3821040db7270e179974018e269ecb650d7fd3a3d42ad62b17dfb7be43645f25e06578e0269f1f744ee4d  myrepos-1.20160123.tar.gz"
sha512sums="cada56e811bff72dbd6161cdd843760d0aa34ab052e5ae6e210f1da0ff92f454246ed65399271892019a7ec2212180080a50251ed056cd49fe56e742394d7127  myrepos-1.20170129.tar.gz"
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 8/13] main/pcmciautils: fix bug

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111009.23880-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749009
DKIM signature
missing
Download raw message
Patch: +31 -5
Source :
https://github.com/openwrt/packages/blob/master/utils/pcmciautils/patches/

---
 main/pcmciautils/APKBUILD             |  9 ++++-----
 main/pcmciautils/disable_yywrap.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 main/pcmciautils/disable_yywrap.patch

diff --git a/main/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD
index a459d000cf..8c8be38f32 100644
--- a/main/pcmciautils/APKBUILD
+++ b/main/pcmciautils/APKBUILD
@@ -10,7 +10,9 @@ subpackages="$pkgname-doc"
depends=
makedepends="sysfsutils-dev bison flex"
source="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
	unsigned.patch"
	unsigned.patch
	disable_yywrap.patch
	"

_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
@@ -33,9 +35,6 @@ package() {
	make DESTDIR="$pkgdir"/ install
	ln -sf pccardctl "$pkgdir"/sbin/lspcmcia
}
md5sums="2e9469c44dcb790d2b497723c2fa0566  pcmciautils-018.tar.xz
ba7aa35c8082cf2ca67785cd8f7f9524  unsigned.patch"
sha256sums="a5c09abeba95f750e8a8b01704114d733f0f0345f34e5c327bbb6a1bfd09c4b8  pcmciautils-018.tar.xz
6f08ef800e0cf1d1b73cd51dfe2f60fb8d1b410150b2f52e32b1439af9fc5f6d  unsigned.patch"
sha512sums="c7c1ecde41a60d3d1fcb12e3be309f8287d0242ad93e17b1286bf2818a0de1f415c89f63fec0571264e5ff87e99ba7ded905e6b671c2f6795ea910a0045261f5  pcmciautils-018.tar.xz
b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557  disable_yywrap.patch
18e5d3bfe3316c49e4a899b9181177c1c275274d5788a4af7299d0c6b8cbdfca8f3465f242356d35c6e96103cb620173e6f93e7e66787d5d2b194c5a4264bf91  unsigned.patch"
diff --git a/main/pcmciautils/disable_yywrap.patch b/main/pcmciautils/disable_yywrap.patch
new file mode 100644
index 0000000000..e30abb0d10
--- /dev/null
+++ b/main/pcmciautils/disable_yywrap.patch
@@ -0,0 +1,27 @@
--- pcmciautils-018/src/lex_config.l
+++ pcmciautils-018/src/lex_config.l
@@ -1,8 +1,8 @@
 /* Special state for handling include files */
 %x src
-%option noinput nounput
+%option noinput nounput noyywrap
 
 %{
 /*
  * Startup tool for non statically mapped PCMCIA sockets
  *
@@ -75,14 +75,10 @@ module		/* skip */ ;
 
 .		return yytext[0];
 
 %%
 
-#ifndef yywrap
-int yywrap() { return 1; }
-#endif
-
 /*======================================================================
 
     Stuff to parse basic data types
 
 ======================================================================*/
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 9/13] main/qca: update new package

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111012.23921-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749012
DKIM signature
missing
Download raw message
Patch: +6 -64
Old package was removed

---
 main/qca/APKBUILD                         | 23 ++++++--------------
 main/qca/fix-base64-decoding-on-ARM.patch | 36 -------------------------------
 main/qca/secmem.patch                     | 11 ----------
 3 files changed, 6 insertions(+), 64 deletions(-)
 delete mode 100644 main/qca/fix-base64-decoding-on-ARM.patch
 delete mode 100644 main/qca/secmem.patch

diff --git a/main/qca/APKBUILD b/main/qca/APKBUILD
index 1f18231938..11bc0da717 100644
--- a/main/qca/APKBUILD
+++ b/main/qca/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer:
pkgname=qca
pkgver=2.0.3
pkgver=2.1.3
pkgrel=0
pkgdesc="Qt cryptographic architecture"
url="http://delta.affinix.com/qca/"
@@ -9,33 +9,22 @@ arch="all"
license="LGPL"
depends=
depends_dev="qt-dev"
makedepends="$depends_dev"
makedepends="$depends_dev cmake cyrus-sasl-dev"
install=""
subpackages="$pkgname-dev $pkgname-doc"
source="http://delta.affinix.com/download/qca/2.0/qca-$pkgver.tar.bz2
	secmem.patch
	fix-base64-decoding-on-ARM.patch"
source="http://download.kde.org/stable/qca/2.1.3/src/qca-${pkgver}.tar.xz"

builddir="$srcdir"/qca-$pkgver

build() {
	cd "$builddir"
	./configure --prefix=/usr \
		|| return 1
	cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_cyrus-sasl_PLUGIN=yes .
	make || return 1
}

package() {
	cd "$builddir"
	make INSTALL_ROOT="$pkgdir" install || return 1
	make DESTDIR="$pkgdir" install || return 1
}

md5sums="fc15bd4da22b8096c51fcfe52d2fa309  qca-2.0.3.tar.bz2
53f5a927d6d654c5a82e106834e79985  secmem.patch
e95b9bc20c732c4f656a28757d4588c7  fix-base64-decoding-on-ARM.patch"
sha256sums="8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f  qca-2.0.3.tar.bz2
0bbe520dfe5f7d3114ed4b6cc772b0250472674b86415fe1d1aeaccaa7271257  secmem.patch
31b61bed284f75c884888673af0a26aae5bf9c7e6f49e964c2fa1f24892a20cc  fix-base64-decoding-on-ARM.patch"
sha512sums="c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb  qca-2.0.3.tar.bz2
a06519a055af21d53bed65d90e31089d3c1e3fdf2459c6c52c394678cb0775a5f262728617eecbbd9e8e7f0340c7aa9326a8eb030de6214e24d7590032db5444  secmem.patch
583c338fe8803f2fc17c8f931efccc893eda32f96b441c764f7d68844c32af3f8e9df61a58e50321ff692b7d1e4d7f06154832dafb982868c7cefad7da20f6ef  fix-base64-decoding-on-ARM.patch"
sha512sums="0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a  qca-2.1.3.tar.xz"
diff --git a/main/qca/fix-base64-decoding-on-ARM.patch b/main/qca/fix-base64-decoding-on-ARM.patch
deleted file mode 100644
index 06deb38258..0000000000
--- a/main/qca/fix-base64-decoding-on-ARM.patch
@@ -1,36 +0,0 @@
From: Rolf Eike Beer <eb@emlix.com>
Date: Mon, 27 Jun 2016 10:55:51 +0000
Subject: fix base64 decoding on ARM
X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=601fd3a05141c614ae48a3ddac44194d669eaae1
---
fix base64 decoding on ARM

This code was broken on ARM and other architectures where "char" is unsigned by
default.

First, it breaks with newer compilers with errors like:

.../src/qca_textfilter.cpp:314:2: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]

Second, if the compiler would just allow this conversion then the unsigned char
would hold 255, which would not be sign extended when cast to an int later, so
all the checks "< 0" will never trigger, and so invalid input characters cannot
be detected.

REVIEW:128295
BUG:364495
---


--- a/src/qca_textfilter.cpp
+++ b/src/qca_textfilter.cpp
@@ -293,7 +293,7 @@
 	// 64 specifies eof
 	// everything else specifies data
 
-	static char tbl[] =
+	static signed char tbl[] =
 	{
 		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
 		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,

diff --git a/main/qca/secmem.patch b/main/qca/secmem.patch
deleted file mode 100644
index 8f2306f7da..0000000000
--- a/main/qca/secmem.patch
@@ -1,11 +0,0 @@
--- a/src/botantools/botan/botan/secmem.h
+++ b/src/botantools/botan/botan/secmem.h
@@ -214,7 +214,7 @@
 
       SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
       SecureVector(const T in[], u32bit n)
-         { MemoryRegion<T>::init(true); set(in, n); }
+         { MemoryRegion<T>::init(true); this->set(in, n); }
       SecureVector(const MemoryRegion<T>& in)
          { MemoryRegion<T>::init(true); set(in); }
       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 10/13] main/rrdtool: dont install in /usr/local

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111014.23962-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749014
DKIM signature
missing
Download raw message
Patch: +41 -0
abuild/postcheck() complains about not putting files in /usr/local

---
 main/rrdtool/APKBUILD                        |  2 ++
 main/rrdtool/dont-install-in-usr-local.patch | 39 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 main/rrdtool/dont-install-in-usr-local.patch

diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index d0c43fbbc2..25bd2994e3 100644
--- a/main/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
@@ -17,6 +17,7 @@ source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz
	lua-install-cmod.patch
	libm-underlinking.patch
	no-posix-fallocate.patch
	dont-install-in-usr-local.patch
	rrdcached.initd
	"

@@ -139,4 +140,5 @@ sha512sums="b980e36932683dbe2c2793c291c34e1c3a7fba208bda35b4b2d4fc994a9539c3c19f
0be4ebb864233cf32fa70c872f5421b2da50ad39d6a265c2f5869337b40647c0b88011ccf41fe17a8d35de915ca1c38d04d67696118e1e32ff774221b1816ab6  lua-install-cmod.patch
94449972ccc7d1a057c2b827c041a16de1667c280a47ef30c1323ec9168812a96374704cc42dd832a30b8cc08d7fad94da44ff3695c66f3a0d324a87158fc23c  libm-underlinking.patch
00d079161551a75f8d4fe5085741d45d9c6b06be0a5163090143c6ab47710e29633414bee4dd68bbf950bf0ba1796bf4623b4f307477265a48f49514c8b790ab  no-posix-fallocate.patch
839d9a2fbb74332cc9d0de18828f1496103b0cca6f05b3f88437dff6289954952f51350dcf01543d234ded19798115d400d9d61722e7193cd7f2bce47c14f6be  dont-install-in-usr-local.patch
c0c27b2c2dfa8e7ec1cb1160d2bda8d7996bbea67f4ce7779da029f583c35e5e415cf46e2a1e5cb8ed2e63d2c58a68fd7471ee6bd820db4c0f4eeeb5c252f8a3  rrdcached.initd"
diff --git a/main/rrdtool/dont-install-in-usr-local.patch b/main/rrdtool/dont-install-in-usr-local.patch
new file mode 100644
index 0000000000..da63381386
--- /dev/null
+++ b/main/rrdtool/dont-install-in-usr-local.patch
@@ -0,0 +1,39 @@

abuild/postcheck() complains about not putting files in /usr/local

---
 bindings/lua/compat-5.1r5/compat-5.1.lua | 4 ++--
 configure.ac                             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bindings/lua/compat-5.1r5/compat-5.1.lua b/bindings/lua/compat-5.1r5/compat-5.1.lua
index b662270..0179122 100644
--- a/bindings/lua/compat-5.1r5/compat-5.1.lua
+++ b/bindings/lua/compat-5.1r5/compat-5.1.lua
@@ -52,8 +52,8 @@ package.path = LUA_PATH or os.getenv("LUA_PATH") or
 package.cpath = LUA_CPATH or os.getenv("LUA_CPATH") or
              "./?.so;" ..
              "./l?.so;" ..
-             "/usr/local/lib/lua/5.0/?.so;" ..
-             "/usr/local/lib/lua/5.0/l?.so"
+             "/usr/lib/lua/5.0/?.so;" ..
+             "/usr/lib/lua/5.0/l?.so"
 
 --
 -- make sure require works with standard libraries
diff --git a/configure.ac b/configure.ac
index 5270b22..8d87da9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -864,7 +864,7 @@ LUA_EOF
           AC_MSG_WARN(Setting Lua include and lib flags to defaults in compat-5.1 and lua 5.1 sources)
           LUA_CFLAGS="-I/usr/local/include -I/usr/local/include/lua -I/usr/local/include/lua/$lua_vdot"
           LUA_LFLAGS="-L/usr/local/lib -L/usr/local/lib/lua -L/usr/local/lib/lua/$lua_vdot $lua_libs"
-          LUA_INSTALL_CMOD="/usr/local/lib/lua/$lua_vdot"
+          LUA_INSTALL_CMOD="/usr/lib/lua/$lua_vdot"
         fi
 
         dnl pass additional lua options
-- 
2.11.1

-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 11/13] main/run-parts: update new package

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111016.24003-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749016
DKIM signature
missing
Download raw message
Patch: +2 -4
Old package was removed

---
 main/run-parts/APKBUILD | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/run-parts/APKBUILD b/main/run-parts/APKBUILD
index 98d97c345e..6092fbdba7 100644
--- a/main/run-parts/APKBUILD
+++ b/main/run-parts/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=run-parts
_pkgname=debianutils
pkgver=4.8
pkgver=4.8.1
pkgrel=0
pkgdesc="run-parts from the debianutils package"
url="http://packages.qa.debian.org/d/debianutils.html"
@@ -28,6 +28,4 @@ package() {
	install -D -m755 run-parts $pkgdir/usr/bin/run-parts
	install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8
}
md5sums="66a37e5ff17be431319bd0b43e9a46b5  debianutils_4.8.tar.xz"
sha256sums="afa95bbe6b6fd3ef3c0c838b2d7232f09fabeff593ca4b5583cffa6748567ee2  debianutils_4.8.tar.xz"
sha512sums="25119e4079892f80d0780ba167a58b789769472611d76e5974df7f5ccd22c95cbbb3ae60f6d23937b968b091eeb835c009071b7ec7ab892a6c7fa9cf119b9b23  debianutils_4.8.tar.xz"
sha512sums="c5da2c6d4ed8b65019f73db3c634d00a358ac45a93947e6eafeddcc3356721b04b19fdb7134aa9561009c35e749e5fa3d3d6ae5dd5db24d9eaf9b8883bf72234  debianutils_4.8.1.tar.xz"
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 12/13] main/userspace-rcu: need perl-utils for perl prove

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111018.24044-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749018
DKIM signature
missing
Download raw message
Patch: +1 -3
prove now is in perl-utils in edge

---
 main/userspace-rcu/APKBUILD | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/main/userspace-rcu/APKBUILD b/main/userspace-rcu/APKBUILD
index 8e31947ac2..056180bdf6 100644
--- a/main/userspace-rcu/APKBUILD
+++ b/main/userspace-rcu/APKBUILD
@@ -10,7 +10,7 @@ arch="all"
license="LGPL2+"
depends=""
depends_dev=""
makedepends="$depends_dev bash perl"
makedepends="$depends_dev bash perl perl-utils"
install=""
subpackages="$pkgname-dev $pkgname-doc"
source="http://lttng.org/files/urcu/$pkgname-$pkgver.tar.bz2"
@@ -47,6 +47,4 @@ dev() {
	rm -rf "$subpkgdir"/usr/share/doc/$pkgname
}

md5sums="920970e35a1a2066c8353eabfeab8730  userspace-rcu-0.9.3.tar.bz2"
sha256sums="1bce32e6a6c967fef6d37adaadf33df19878d69673f9ef9d3f2470e0c6ed4006  userspace-rcu-0.9.3.tar.bz2"
sha512sums="35a2d2ce3c738fcd0932c27fa0e1a42d9c6e2a0506e5792c8e570dccbc9601e15c95501e0b277a5dc48e7c7a0c315f00c6d6ad7c1dcdf8512251bcc6a690ce61  userspace-rcu-0.9.3.tar.bz2"
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 13/13] main/znc: update new package

Tuan M. Hoang <tmhoang@flatglobe.org>
Details
Message ID
<20170317111020.24085-1-tmhoang@flatglobe.org>
In-Reply-To
<20170317110855.23575-1-tmhoang@flatglobe.org> (view parent)
Sender timestamp
1489749020
DKIM signature
missing
Download raw message
Patch: +2 -8
Old package was removed

---
 main/znc/APKBUILD | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/main/znc/APKBUILD b/main/znc/APKBUILD
index 6d3cc547d9..4fbcf61eab 100644
--- a/main/znc/APKBUILD
+++ b/main/znc/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=znc
pkgver=1.6.4
pkgver=1.6.5
pkgrel=1
pkgdesc="An advanced IRC bouncer"
url="http://znc.in"
@@ -113,12 +113,6 @@ modpython() {
	_mv_mod modpython modpython.so
}

md5sums="368bca41192cbfc0b873699d6a82e0d5  znc-1.6.4.tar.gz
0170c261efe6da389bf637b00dfcb984  znc.initd
1817e134ec3fa6ec05d36d4995a5aaa5  znc.confd"
sha256sums="431097eb17860bfc980f3e68fdd75f98af4bdeecd793c84835c6cb11c3320d1c  znc-1.6.4.tar.gz
fa67ed45506863f5c0d7a73a4ab2c7b199a8eb02a2b201dbb64bd8bace00bbf2  znc.initd
be3155e79e6ed13be88fbf9d99f6889b3ee8425837120c448c827b8302672063  znc.confd"
sha512sums="d66069a7db4d85f8f132aed1ee4b0da8a04c61ab0e2df36426eb326e713401e824c9653b7edd0f7b317779b95b56965bc987c7099eb83b4950386462fd96cd8f  znc-1.6.4.tar.gz
sha512sums="d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626  znc-1.6.5.tar.gz
3287affd90f0048a7e790179d97ac9964498cc87f833afb97c6298abfbdbdf1131edd1211b3b64290a862ae4a768f63c346c274a18664a2e22e2815632a726c2  znc.initd
352f18d64cbfbd5970c859f2ae2290c0ddafcbd8f1bb5d74f33976bc8388f65a75f8a9a73a093fbac12f2d243d4bcf74380bbb3aaab8d68f7bf4eab7ce3bea46  znc.confd"
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)