aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEivind Uggedal <eivind@uggedal.com>2014-05-30 17:58:24 +0000
committerEivind Uggedal <eivind@uggedal.com>2014-05-30 17:58:39 +0000
commitf41e00e67c49c5bc15bf99b563250e4ea179022c (patch)
tree122e465592c237b62cad9245be5bd4e79a01dd39
parent45fb3cea82f23519b7c3a6bc08bcc2724e422516 (diff)
downloadaports-f41e00e67c49c5bc15bf99b563250e4ea179022c.tar.bz2
aports-f41e00e67c49c5bc15bf99b563250e4ea179022c.tar.xz
main/irssi: upgrade to 0.8.16
-rw-r--r--main/irssi/APKBUILD25
-rw-r--r--main/irssi/irssi-0.8.16-format-security.patch22
2 files changed, 10 insertions, 37 deletions
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index 5c099bb48b..4aaf6535c8 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -1,7 +1,6 @@
# Maintainer: Kiyoshi Aman <kiyoshi.aman at gmail.com>
pkgname=irssi
-pkgver=0.8.16_rc1
-_pkgver=${pkgver/_/-}
+pkgver=0.8.16
pkgrel=0
pkgdesc="A modular textUI IRC client with IPv6 support"
url="http://irssi.org/"
@@ -10,13 +9,12 @@ license="GPL2+"
depends=
makedepends="glib-dev openssl-dev ncurses-dev perl-dev automake autoconf libtool"
subpackages="$pkgname-doc $pkgname-dev $pkgname-proxy $pkgname-perl"
-source="http://irssi.org/files/irssi-$_pkgver.tar.bz2
+source="http://irssi.org/files/irssi-$pkgver.tar.bz2
$pkgname-italics.patch
irssi-0.8.15-man-fix.patch
- irssi-0.8.15-no-static-unload.patch
- irssi-0.8.16-format-security.patch"
+ irssi-0.8.15-no-static-unload.patch"
-_builddir="$srcdir"/$pkgname-$_pkgver
+_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
local i
cd "$_builddir"
@@ -73,18 +71,15 @@ proxy() {
mv "$pkgdir"/usr/lib/irssi/modules/libirc_proxy.* "$subpkgdir"/usr/lib/irssi/modules/
}
-md5sums="275c926dcbb11059f8685906df7cfe49 irssi-0.8.16-rc1.tar.bz2
+md5sums="4346119c4c000d0198cda17666ff1f06 irssi-0.8.16.tar.bz2
bb8b9f8b960837ad061a8e5b9b19824b irssi-italics.patch
6e776c1c5a8dd4a8d03e710ff783f919 irssi-0.8.15-man-fix.patch
-96aec1545b531e2a378ae0e38ccbe6e9 irssi-0.8.15-no-static-unload.patch
-88fc15df221db3f228c65d844c7a1342 irssi-0.8.16-format-security.patch"
-sha256sums="64d3edcb5e00f63c7926c0f59403d5ab1dcc414a8539b860e152f3fb87d31674 irssi-0.8.16-rc1.tar.bz2
+96aec1545b531e2a378ae0e38ccbe6e9 irssi-0.8.15-no-static-unload.patch"
+sha256sums="3f7afed2a2754f1f5bf5cf2c87476f3c4d4aa5d71f9f4f68d05f927220d19f97 irssi-0.8.16.tar.bz2
3e65898551e89e99ddce83ab69a8a37209181a1e6ae09bd9412805c9bf8cffa5 irssi-italics.patch
3c504ba356b2e0d53a767b8194b6b31b2ee41a15c6bc27ae4c31f782f41a1411 irssi-0.8.15-man-fix.patch
-ce57e741311b7335cded9da4d7f7f3f68b3b367fbe457043d0e06674c76d48d9 irssi-0.8.15-no-static-unload.patch
-b2f974de02dabce6f96c18aef0e64102d0cf129d37da56f599a3fa5b84fb75b4 irssi-0.8.16-format-security.patch"
-sha512sums="a172737ce1abfb020cca9b1aa62343e89831faada842915156f3327ef4c0c240ea89ea1da058449a21f34d383bb80d743ef9568264b70a582e55a4a3723fd289 irssi-0.8.16-rc1.tar.bz2
+ce57e741311b7335cded9da4d7f7f3f68b3b367fbe457043d0e06674c76d48d9 irssi-0.8.15-no-static-unload.patch"
+sha512sums="47ad923cc91d5eee3f402126f4da396544cef943f6313af3fd102953939224e97c1bba31af3ac93e67fc84f089b0cfc73e8e7dd7b46b81abe1326567fef33de0 irssi-0.8.16.tar.bz2
cc46ee115cbad0a1df55f4d6fff31b0dddc526c29b49108338c16baf4b632627a818b8fb0ab4b6a51cf1c0e1b5da26eaecf3ecf087bdedcc1b7a80e21d0e5c08 irssi-italics.patch
7e081427c84df33a27d083e7c43ba34af7059e1344b0d6131c586affb9515c19adbcadb32ff5dc8a10824a59a88da46e40fd8074a856ea247c7f0a19115b8ac8 irssi-0.8.15-man-fix.patch
-1dd5f2d622d825daaab29e9ef19edc44e890a7e7ba82623c0e090b7828051ec5a97faf03a5a755e966b53c891dd645076e8a50a69c2abb15998ca3b42a117479 irssi-0.8.15-no-static-unload.patch
-4e3d1dd76bd118ba93010576bbbc48fef8e87a26083af2e1ffaaa488ce6b28cf4b68b9f1e19673f6c2e8c9afd8816d38ce61361aa47fb174844d61be0364110d irssi-0.8.16-format-security.patch"
+1dd5f2d622d825daaab29e9ef19edc44e890a7e7ba82623c0e090b7828051ec5a97faf03a5a755e966b53c891dd645076e8a50a69c2abb15998ca3b42a117479 irssi-0.8.15-no-static-unload.patch"
diff --git a/main/irssi/irssi-0.8.16-format-security.patch b/main/irssi/irssi-0.8.16-format-security.patch
deleted file mode 100644
index 34fca6cce7..0000000000
--- a/main/irssi/irssi-0.8.16-format-security.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/core/network.c b/src/core/network.c
-index d7c1017..5954d1f 100644
---- a/src/core/network.c
-+++ b/src/core/network.c
-@@ -356,7 +356,7 @@ int net_receive(GIOChannel *handle, char *buf, int len)
-
- status = g_io_channel_read_chars(handle, buf, len, &ret, &err);
- if (err != NULL) {
-- g_warning(err->message);
-+ g_warning("%s", err->message);
- g_error_free(err);
- }
- if (status == G_IO_STATUS_ERROR || status == G_IO_STATUS_EOF)
-@@ -377,7 +377,7 @@ int net_transmit(GIOChannel *handle, const char *data, int len)
-
- status = g_io_channel_write_chars(handle, (char *) data, len, &ret, &err);
- if (err != NULL) {
-- g_warning(err->message);
-+ g_warning("%s", err->message);
- g_error_free(err);
- }
- if (status == G_IO_STATUS_ERROR)