2 files changed, 22 insertions, 26 deletions

diff --git a/meta-networking/recipes-irc/znc/znc_1.10.1.bb b/meta-networking/recipes-irc/znc/znc_1.10.1.bb
new file mode 100644
index 0000000000..4477068bba
--- /dev/null
+++ b/meta-networking/recipes-irc/znc/znc_1.10.1.bb
@@ -0,0 +1,22 @@
+SUMMARY = "ZNC, an advanced IRC bouncer"
+SECTION = "net"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+DEPENDS = "zlib"
+SRC_URI = "gitsm://github.com/znc/znc.git;branch=master;protocol=https;tag=${BP}"
+
+SRCREV = "29694fd26f5e9ec46731ee13bf66224181984966"
+
+inherit cmake pkgconfig
+
+PACKAGECONFIG ??= "openssl zlib icu ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG[ipv6] = "-DWANT_IPV6=YES, -DWANT_IPV6=NO"
+PACKAGECONFIG[openssl] = "-DWANT_OPENSSL=YES, -DWANT_OPENSSL=NO, openssl"
+PACKAGECONFIG[zlib] = "-DWANT_ZLIB=YES, -DWANT_ZLIB=NO"
+PACKAGECONFIG[icu] = "-DWANT_ICU=YES, -DWANT_ICU=NO, icu"
+PACKAGECONFIG[i18n] = "-DWANT_I18N=YES, -DWANT_I18N=NO, boost gettext-native"
+
+do_install:append() {
+        sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g; s|${STAGING_BINDIR_NATIVE}||g' ${D}${libdir}/pkgconfig/*.pc
+}
diff --git a/meta-networking/recipes-irc/znc/znc_1.8.2.bb b/meta-networking/recipes-irc/znc/znc_1.8.2.bb
deleted file mode 100644
index 7356115d53..0000000000
--- a/meta-networking/recipes-irc/znc/znc_1.8.2.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "ZNC, an advanced IRC bouncer"
-SECTION = "net"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-DEPENDS = "openssl zlib icu"
-
-SRC_URI = "gitsm://github.com/znc/znc.git;branch=master;protocol=https"
-
-SRCREV = "bf253640d33d03331310778e001fb6f5aba2989e"
-
-
-inherit autotools-brokensep pkgconfig
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-
-# ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail
-do_configure:prepend() {
-    automake --add-missing || true
-}
-
-do_install:append() {
-    sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc
-    sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/znc-buildmod
-}