diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-16 18:32:48 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-16 18:32:48 +0000 |
| commit | 844d003854c3632d2298ae7c3f02ff5ce4c1f988 (patch) | |
| tree | a949c9c2a09634645efb009b9a25fa3a4d95543a | |
| parent | 8db768693adb0c03dba1ce5b1b4e1b48144df011 (diff) | |
| download | aports-844d003854c3632d2298ae7c3f02ff5ce4c1f988.tar.bz2 aports-844d003854c3632d2298ae7c3f02ff5ce4c1f988.tar.xz | |
main/charybdis: fix musl build and some potentially harmful warnings
| -rw-r--r-- | main/charybdis/APKBUILD | 8 | ||||
| -rw-r--r-- | main/charybdis/fix-ratbox-errors.patch | 33 |
2 files changed, 40 insertions, 1 deletions
diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD index bca97e030..145a4eed3 100644 --- a/main/charybdis/APKBUILD +++ b/main/charybdis/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=charybdis pkgver=3.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="A highly-scalable IRCv3-compliant IRC daemon" url="http://www.atheme.org/project/charybdis" arch="all" @@ -14,12 +14,15 @@ makedepends="$depends_dev" install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-doc" source="saveas-http://www.stack.nl/~jilles/irc/$pkgname-$pkgver.tbz2/$pkgname-$pkgver.tar.bz2 + fix-ratbox-errors.patch $pkgname.initd $pkgname.confd" + _builddir="$srcdir"/$pkgname-$pkgver prepare() { local i cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; @@ -61,11 +64,14 @@ package() { } md5sums="54245396b829f8d19d3958cde9c3bd65 charybdis-3.4.2.tar.bz2 +3bc27f257fdd9de99cb238ac2f2a4e92 fix-ratbox-errors.patch ce8dc0025b4e50fbec2aa643a947c1b0 charybdis.initd 11d70cc7c9fa0eb5ad52af35801d57c6 charybdis.confd" sha256sums="8a38e67072d90147c40202918c82237765e339cbc849456da54994ce6e31b754 charybdis-3.4.2.tar.bz2 +cbbefdb9b54c6866eb0a8dad20ffff6cfbef1e5ba93e8d67c7c414d2c67eefbb fix-ratbox-errors.patch 3bd4b0b58189518fa72b9d0c2226e83499ab718189f054a889f4e680f3a20e18 charybdis.initd 3d1d8b8e722efe6a9eb3171a65d96651bb93c8d6265bd4980bcbb4b8d500f6ad charybdis.confd" sha512sums="4bd4126cbb023e8ca1ec3003d92893dd44f9bdd8ce5d3fb471fed0b62eb4aa5ff410a6e769ee7daab4864492d49ff594e3e8c7fea05318eb2308efc2195dc8a3 charybdis-3.4.2.tar.bz2 +47493bfc76583191d324df100a9d1e7234b3e9061920431835ac05b725e7ab5de5f35a54b36829f5cfa2ae12ba0f667b12d50eddfe5a05a9599242387fba789f fix-ratbox-errors.patch fef24d361acd96f1e5891e484cbba8ef1dd4a0091550e6a7ae7fe6d053311b80fcdfe4f2307ebf1c4af7ec08ce35ba15bf4a8d499a0c9eb4956b00cd28cf8487 charybdis.initd 1886b312b0ea40945de45db7a379bff2a3af426155fb77676e03f21f8d1d733e057fb5c3cb65fb72bb56008c4c92f3d2d0010563f871fd0802446de443ddfd5e charybdis.confd" diff --git a/main/charybdis/fix-ratbox-errors.patch b/main/charybdis/fix-ratbox-errors.patch new file mode 100644 index 000000000..a22c562f5 --- /dev/null +++ b/main/charybdis/fix-ratbox-errors.patch @@ -0,0 +1,33 @@ +--- charybdis-3.4.2.orig/libratbox/src/commio.c ++++ charybdis-3.4.2/libratbox/src/commio.c +@@ -2221,7 +2221,7 @@ + char empty = '0'; + char *buf; + +- memset(&msg, 0, sizeof(&msg)); ++ memset(&msg, 0, sizeof(msg)); + if(datasize == 0) + { + iov[0].iov_base = ∅ +--- charybdis-3.4.2.orig/libratbox/src/epoll.c ++++ charybdis-3.4.2/libratbox/src/epoll.c +@@ -405,7 +405,7 @@ + struct sigevent ev; + struct itimerspec ts; + +- memset(&ev, 0, sizeof(&ev)); ++ memset(&ev, 0, sizeof(ev)); + event->comm_ptr = rb_malloc(sizeof(timer_t)); + id = event->comm_ptr; + ev.sigev_notify = SIGEV_SIGNAL; +--- charybdis-3.4.2.orig/libratbox/src/sigio.c ++++ charybdis-3.4.2/libratbox/src/sigio.c +@@ -412,7 +412,7 @@ + if(can_do_event <= 0) + return 0; + +- memset(&ev, 0, sizeof(&ev)); ++ memset(&ev, 0, sizeof(ev)); + event->comm_ptr = rb_malloc(sizeof(timer_t)); + id = event->comm_ptr; + ev.sigev_notify = SIGEV_SIGNAL; |