diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-11-19 12:05:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-11-19 12:06:49 +0000 |
| commit | 19316aa9e8d3d9523c600269c03896042a26b732 (patch) | |
| tree | 78f620e25eb7cd5c50d5fc40b49aff672fa82dea | |
| parent | a35c83d0624a0383545f6bd26fceaecff16e8d1e (diff) | |
| download | aports-19316aa9e8d3d9523c600269c03896042a26b732.tar.bz2 aports-19316aa9e8d3d9523c600269c03896042a26b732.tar.xz | |
main/znc: upgrade to 1.0
fixes #1468
| -rw-r--r-- | main/znc/APKBUILD | 13 | ||||
| -rw-r--r-- | main/znc/libiconv.patch | 33 |
2 files changed, 20 insertions, 26 deletions
diff --git a/main/znc/APKBUILD b/main/znc/APKBUILD index 4077b40778..568ed2ece9 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=0.206 +pkgver=1.0 pkgrel=0 pkgdesc="An advanced IRC bouncer" url="http://znc.in" @@ -72,22 +72,17 @@ dev() { extra() { pkgdesc="Extra modules for ZNC" - _mv_mod antiidle.so \ + _mv_mod \ autovoice.so \ block_motd.so \ charset.so \ clearbufferonmsg.so \ ctcpflood.so \ - droproot.so \ - email.so \ - fakeonline.so \ flooddetach.so \ imapauth.so \ listsockets.so \ log.so \ - motdfile.so \ notify_connect.so \ - saslauth.so \ send_raw.so \ shell.so } @@ -105,5 +100,5 @@ modperl() { _mv_mod modperl modperl.so } -md5sums="b7d3f21da81abaeb553066b0e10beb53 znc-0.206.tar.gz -c0c8a4372b79a52a287923240f24c644 libiconv.patch" +md5sums="23807ca830c27392cccb6774f542df6e znc-1.0.tar.gz +54cf06c396fd7769ecf6cbc762472492 libiconv.patch" diff --git a/main/znc/libiconv.patch b/main/znc/libiconv.patch index 276fbcfd8c..1fd5838c21 100644 --- a/main/znc/libiconv.patch +++ b/main/znc/libiconv.patch @@ -1,18 +1,17 @@ -diff --git a/configure.ac b/configure.ac -index 9131a01..47a2e37 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -458,7 +458,12 @@ fi - if test x"$EXTRA" = "xyes" +--- ./configure.ac.orig ++++ ./configure.ac +@@ -504,7 +504,13 @@ + fi + + AC_CHECK_FUNC( iconv, CHARSET=1 ) +-AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) ++dnl On some systems iconv is in a separate library, and may actually ++dnl be named libiconv. ++AC_CHECK_LIB( iconv, libiconv_open, LIBICONV=-liconv ; CHARSET=1 ) ++if test $ac_cv_lib_iconv_libiconv = no; then ++ AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) ++fi ++ + if test "x$CHARSET" = "x1" then - AC_CHECK_FUNC( iconv, CHARSET=1 ) -- AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) -+ dnl On some systems iconv is in a separate library, and may actually -+ dnl be named libiconv. -+ AC_CHECK_LIB( iconv, libiconv_open, LIBICONV=-liconv ; CHARSET=1 ) -+ if test $ac_cv_lib_iconv_libiconv = no; then -+ AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) -+ fi - if test "x$CHARSET" = "x1" - then - AC_MSG_CHECKING([whether iconv expects a const second argument]) + AC_MSG_CHECKING([whether iconv expects a const second argument]) |