Date: Monday, December 7, 2015 @ 00:13:23 Author: bpiotrowski Revision: 149346
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: minbif/repos/community-staging-i686/ minbif/repos/community-staging-i686/PKGBUILD (from rev 149345, minbif/trunk/PKGBUILD) minbif/repos/community-staging-i686/minbif-gcc-4.7.patch (from rev 149345, minbif/trunk/minbif-gcc-4.7.patch) minbif/repos/community-staging-i686/minbif-imlib.patch (from rev 149345, minbif/trunk/minbif-imlib.patch) minbif/repos/community-staging-i686/minbif.install (from rev 149345, minbif/trunk/minbif.install) minbif/repos/community-staging-i686/minbif.service (from rev 149345, minbif/trunk/minbif.service) minbif/repos/community-staging-i686/minbif.tmpfiles.conf (from rev 149345, minbif/trunk/minbif.tmpfiles.conf) minbif/repos/community-staging-x86_64/ minbif/repos/community-staging-x86_64/PKGBUILD (from rev 149345, minbif/trunk/PKGBUILD) minbif/repos/community-staging-x86_64/minbif-gcc-4.7.patch (from rev 149345, minbif/trunk/minbif-gcc-4.7.patch) minbif/repos/community-staging-x86_64/minbif-imlib.patch (from rev 149345, minbif/trunk/minbif-imlib.patch) minbif/repos/community-staging-x86_64/minbif.install (from rev 149345, minbif/trunk/minbif.install) minbif/repos/community-staging-x86_64/minbif.service (from rev 149345, minbif/trunk/minbif.service) minbif/repos/community-staging-x86_64/minbif.tmpfiles.conf (from rev 149345, minbif/trunk/minbif.tmpfiles.conf) -----------------------------------------------+ community-staging-i686/PKGBUILD | 51 ++++++++++++ community-staging-i686/minbif-gcc-4.7.patch | 98 ++++++++++++++++++++++++ community-staging-i686/minbif-imlib.patch | 19 ++++ community-staging-i686/minbif.install | 11 ++ community-staging-i686/minbif.service | 11 ++ community-staging-i686/minbif.tmpfiles.conf | 1 community-staging-x86_64/PKGBUILD | 51 ++++++++++++ community-staging-x86_64/minbif-gcc-4.7.patch | 98 ++++++++++++++++++++++++ community-staging-x86_64/minbif-imlib.patch | 19 ++++ community-staging-x86_64/minbif.install | 11 ++ community-staging-x86_64/minbif.service | 11 ++ community-staging-x86_64/minbif.tmpfiles.conf | 1 12 files changed, 382 insertions(+) Copied: minbif/repos/community-staging-i686/PKGBUILD (from rev 149345, minbif/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: AkiraYB <brunoyb!yahoo,com,br> + +pkgname=minbif +pkgver=1.0.5 +pkgrel=6 +pkgdesc='An IRC gateway to IM networks that uses libpurple.' +arch=('i686' 'x86_64') +url='http://minbif.im/' +license=('GPL2') +depends=('gnutls' 'libcaca' 'libpurple') +makedepends=('cmake') +optdepends=('xinetd: to run minbif through xinetd') +backup=('etc/minbif/minbif.conf' + 'etc/minbif/minbif.motd') +install='minbif.install' +source=("http://minbif.im/attachments/download/148/${pkgname}-${pkgver}.tar.gz" + 'minbif-gcc-4.7.patch' + 'minbif-imlib.patch' + 'minbif.service' + 'minbif.tmpfiles.conf') +md5sums=('00c5c1abbe2b8a9d900961832c7909a8' + '2235c45d5bdb01e9ef4b11d2a41d49bb' + 'c94ea3152b7d279da25947e0d1deff14' + 'b34876e339a37dfb1dc6cd0b9d8edf9d' + '3360f5d1bf9bc69fd9b7c9326f321dc3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # build fixes + patch -p1 -i ../minbif-gcc-4.7.patch + patch -p1 -i ../minbif-imlib.patch + + make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \ + ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -dm0755 "${pkgdir}/var/lib" + install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif" + install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif/users" + + make DESTDIR="${pkgdir}" install + + install -Dm0644 "${srcdir}/minbif.service" "${pkgdir}/usr/lib/systemd/system/minbif.service" + install -Dm0644 "${srcdir}/minbif.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/minbif.conf" +} Copied: minbif/repos/community-staging-i686/minbif-gcc-4.7.patch (from rev 149345, minbif/trunk/minbif-gcc-4.7.patch) =================================================================== --- community-staging-i686/minbif-gcc-4.7.patch (rev 0) +++ community-staging-i686/minbif-gcc-4.7.patch 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,98 @@ +diff --git a/src/im/account.cpp b/src/im/account.cpp +index f155334..21baa5f 100644 +--- a/src/im/account.cpp ++++ b/src/im/account.cpp +@@ -18,6 +18,7 @@ + + #include <cassert> + #include <cstring> ++#include <unistd.h> + #ifdef HAVE_IMLIB + #include <Imlib2.h> + #endif /* HAVE_IMLIB */ +diff --git a/src/im/request.cpp b/src/im/request.cpp +index e72cbc9..a247e3b 100644 +--- a/src/im/request.cpp ++++ b/src/im/request.cpp +@@ -18,6 +18,7 @@ + + #include <errno.h> + #include <string.h> ++#include <unistd.h> + + #include "request.h" + #include "buddy.h" +diff --git a/src/irc/dcc.cpp b/src/irc/dcc.cpp +index 6d05034..231122c 100644 +--- a/src/irc/dcc.cpp ++++ b/src/irc/dcc.cpp +@@ -23,6 +23,7 @@ + #include <string.h> + #include <sys/types.h> + #include <netinet/in.h> ++#include <unistd.h> + + #include "dcc.h" + #include "nick.h" +diff --git a/src/irc/irc.cpp b/src/irc/irc.cpp +index 5d28acb..116d9db 100644 +--- a/src/irc/irc.cpp ++++ b/src/irc/irc.cpp +@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const + Buddy* IRC::getNick(const im::Buddy& buddy) const + { + map<string, Nick*>::const_iterator it; +- Buddy* nb; ++ Buddy* nb = NULL; + for(it = users.begin(); + it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy); + ++it) +@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const + ConvNick* IRC::getNick(const im::Conversation& conv) const + { + map<string, Nick*>::const_iterator it; +- ConvNick* n; ++ ConvNick* n = NULL; + for(it = users.begin(); + it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv); + ++it) +diff --git a/src/server_poll/daemon_fork.cpp b/src/server_poll/daemon_fork.cpp +index 53606a0..e205a61 100644 +--- a/src/server_poll/daemon_fork.cpp ++++ b/src/server_poll/daemon_fork.cpp +@@ -20,7 +20,7 @@ + #include <cassert> + #include <cstring> + #include <cerrno> +-#include <glib/gmain.h> ++#include <glib.h> + #include <sys/socket.h> + #include <sys/stat.h> + #include <arpa/inet.h> +diff --git a/src/server_poll/inetd.cpp b/src/server_poll/inetd.cpp +index 291c40f..f747e74 100644 +--- a/src/server_poll/inetd.cpp ++++ b/src/server_poll/inetd.cpp +@@ -17,7 +17,8 @@ + */ + + #include <cassert> +-#include <glib/gmain.h> ++#include <glib.h> ++#include <unistd.h> + + #include "inetd.h" + #include "irc/irc.h" +diff --git a/src/sockwrap/sockwrap.cpp b/src/sockwrap/sockwrap.cpp +index f10755c..478c616 100644 +--- a/src/sockwrap/sockwrap.cpp ++++ b/src/sockwrap/sockwrap.cpp +@@ -16,6 +16,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <unistd.h> ++ + #include "sockwrap.h" + #include "sockwrap_plain.h" + #ifdef HAVE_TLS Copied: minbif/repos/community-staging-i686/minbif-imlib.patch (from rev 149345, minbif/trunk/minbif-imlib.patch) =================================================================== --- community-staging-i686/minbif-imlib.patch (rev 0) +++ community-staging-i686/minbif-imlib.patch 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,19 @@ +commit 7aaf2a24260cabbfc04791291160a4100e550b5a +Author: Romain Bignon <rom...@budget-insight.com> +Date: Tue May 5 10:42:49 2015 +0200 + + ImlibLoadError has been renamed to Imlib_Load_Error in latest version of imlib2 + +diff --git a/src/im/account.cpp b/src/im/account.cpp +index efde142..4ac5163 100644 +--- a/src/im/account.cpp ++++ b/src/im/account.cpp +@@ -275,7 +275,7 @@ void Account::setBuddyIcon(string filename) + else + { + char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0); +- ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN; ++ Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN; + + close(temp_fd); + /* Try to encode in a supported format. */ Copied: minbif/repos/community-staging-i686/minbif.install (from rev 149345, minbif/trunk/minbif.install) =================================================================== --- community-staging-i686/minbif.install (rev 0) +++ community-staging-i686/minbif.install 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,11 @@ +post_install() { + grep -qs ^minbif: /etc/group || groupadd -g 67 minbif + grep -qs ^minbif: /etc/passwd || useradd -u 67 -g minbif \ + -d /var/lib/minbif -s /bin/false minbif + + systemd-tmpfiles --create minbif.conf +} + +post_upgrade() { + post_install $1 +} Copied: minbif/repos/community-staging-i686/minbif.service (from rev 149345, minbif/trunk/minbif.service) =================================================================== --- community-staging-i686/minbif.service (rev 0) +++ community-staging-i686/minbif.service 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,11 @@ +[Unit] +Description=minbif daemon + +[Service] +Type=forking +PIDFile=/run/minbif/minbif.pid +User=minbif +ExecStart=/usr/bin/minbif --pidfile /run/minbif/minbif.pid /etc/minbif/minbif.conf + +[Install] +WantedBy=multi-user.target Copied: minbif/repos/community-staging-i686/minbif.tmpfiles.conf (from rev 149345, minbif/trunk/minbif.tmpfiles.conf) =================================================================== --- community-staging-i686/minbif.tmpfiles.conf (rev 0) +++ community-staging-i686/minbif.tmpfiles.conf 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1 @@ +d /run/minbif - minbif minbif - Copied: minbif/repos/community-staging-x86_64/PKGBUILD (from rev 149345, minbif/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: AkiraYB <brunoyb!yahoo,com,br> + +pkgname=minbif +pkgver=1.0.5 +pkgrel=6 +pkgdesc='An IRC gateway to IM networks that uses libpurple.' +arch=('i686' 'x86_64') +url='http://minbif.im/' +license=('GPL2') +depends=('gnutls' 'libcaca' 'libpurple') +makedepends=('cmake') +optdepends=('xinetd: to run minbif through xinetd') +backup=('etc/minbif/minbif.conf' + 'etc/minbif/minbif.motd') +install='minbif.install' +source=("http://minbif.im/attachments/download/148/${pkgname}-${pkgver}.tar.gz" + 'minbif-gcc-4.7.patch' + 'minbif-imlib.patch' + 'minbif.service' + 'minbif.tmpfiles.conf') +md5sums=('00c5c1abbe2b8a9d900961832c7909a8' + '2235c45d5bdb01e9ef4b11d2a41d49bb' + 'c94ea3152b7d279da25947e0d1deff14' + 'b34876e339a37dfb1dc6cd0b9d8edf9d' + '3360f5d1bf9bc69fd9b7c9326f321dc3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # build fixes + patch -p1 -i ../minbif-gcc-4.7.patch + patch -p1 -i ../minbif-imlib.patch + + make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \ + ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -dm0755 "${pkgdir}/var/lib" + install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif" + install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif/users" + + make DESTDIR="${pkgdir}" install + + install -Dm0644 "${srcdir}/minbif.service" "${pkgdir}/usr/lib/systemd/system/minbif.service" + install -Dm0644 "${srcdir}/minbif.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/minbif.conf" +} Copied: minbif/repos/community-staging-x86_64/minbif-gcc-4.7.patch (from rev 149345, minbif/trunk/minbif-gcc-4.7.patch) =================================================================== --- community-staging-x86_64/minbif-gcc-4.7.patch (rev 0) +++ community-staging-x86_64/minbif-gcc-4.7.patch 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,98 @@ +diff --git a/src/im/account.cpp b/src/im/account.cpp +index f155334..21baa5f 100644 +--- a/src/im/account.cpp ++++ b/src/im/account.cpp +@@ -18,6 +18,7 @@ + + #include <cassert> + #include <cstring> ++#include <unistd.h> + #ifdef HAVE_IMLIB + #include <Imlib2.h> + #endif /* HAVE_IMLIB */ +diff --git a/src/im/request.cpp b/src/im/request.cpp +index e72cbc9..a247e3b 100644 +--- a/src/im/request.cpp ++++ b/src/im/request.cpp +@@ -18,6 +18,7 @@ + + #include <errno.h> + #include <string.h> ++#include <unistd.h> + + #include "request.h" + #include "buddy.h" +diff --git a/src/irc/dcc.cpp b/src/irc/dcc.cpp +index 6d05034..231122c 100644 +--- a/src/irc/dcc.cpp ++++ b/src/irc/dcc.cpp +@@ -23,6 +23,7 @@ + #include <string.h> + #include <sys/types.h> + #include <netinet/in.h> ++#include <unistd.h> + + #include "dcc.h" + #include "nick.h" +diff --git a/src/irc/irc.cpp b/src/irc/irc.cpp +index 5d28acb..116d9db 100644 +--- a/src/irc/irc.cpp ++++ b/src/irc/irc.cpp +@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const + Buddy* IRC::getNick(const im::Buddy& buddy) const + { + map<string, Nick*>::const_iterator it; +- Buddy* nb; ++ Buddy* nb = NULL; + for(it = users.begin(); + it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy); + ++it) +@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const + ConvNick* IRC::getNick(const im::Conversation& conv) const + { + map<string, Nick*>::const_iterator it; +- ConvNick* n; ++ ConvNick* n = NULL; + for(it = users.begin(); + it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv); + ++it) +diff --git a/src/server_poll/daemon_fork.cpp b/src/server_poll/daemon_fork.cpp +index 53606a0..e205a61 100644 +--- a/src/server_poll/daemon_fork.cpp ++++ b/src/server_poll/daemon_fork.cpp +@@ -20,7 +20,7 @@ + #include <cassert> + #include <cstring> + #include <cerrno> +-#include <glib/gmain.h> ++#include <glib.h> + #include <sys/socket.h> + #include <sys/stat.h> + #include <arpa/inet.h> +diff --git a/src/server_poll/inetd.cpp b/src/server_poll/inetd.cpp +index 291c40f..f747e74 100644 +--- a/src/server_poll/inetd.cpp ++++ b/src/server_poll/inetd.cpp +@@ -17,7 +17,8 @@ + */ + + #include <cassert> +-#include <glib/gmain.h> ++#include <glib.h> ++#include <unistd.h> + + #include "inetd.h" + #include "irc/irc.h" +diff --git a/src/sockwrap/sockwrap.cpp b/src/sockwrap/sockwrap.cpp +index f10755c..478c616 100644 +--- a/src/sockwrap/sockwrap.cpp ++++ b/src/sockwrap/sockwrap.cpp +@@ -16,6 +16,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <unistd.h> ++ + #include "sockwrap.h" + #include "sockwrap_plain.h" + #ifdef HAVE_TLS Copied: minbif/repos/community-staging-x86_64/minbif-imlib.patch (from rev 149345, minbif/trunk/minbif-imlib.patch) =================================================================== --- community-staging-x86_64/minbif-imlib.patch (rev 0) +++ community-staging-x86_64/minbif-imlib.patch 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,19 @@ +commit 7aaf2a24260cabbfc04791291160a4100e550b5a +Author: Romain Bignon <rom...@budget-insight.com> +Date: Tue May 5 10:42:49 2015 +0200 + + ImlibLoadError has been renamed to Imlib_Load_Error in latest version of imlib2 + +diff --git a/src/im/account.cpp b/src/im/account.cpp +index efde142..4ac5163 100644 +--- a/src/im/account.cpp ++++ b/src/im/account.cpp +@@ -275,7 +275,7 @@ void Account::setBuddyIcon(string filename) + else + { + char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0); +- ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN; ++ Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN; + + close(temp_fd); + /* Try to encode in a supported format. */ Copied: minbif/repos/community-staging-x86_64/minbif.install (from rev 149345, minbif/trunk/minbif.install) =================================================================== --- community-staging-x86_64/minbif.install (rev 0) +++ community-staging-x86_64/minbif.install 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,11 @@ +post_install() { + grep -qs ^minbif: /etc/group || groupadd -g 67 minbif + grep -qs ^minbif: /etc/passwd || useradd -u 67 -g minbif \ + -d /var/lib/minbif -s /bin/false minbif + + systemd-tmpfiles --create minbif.conf +} + +post_upgrade() { + post_install $1 +} Copied: minbif/repos/community-staging-x86_64/minbif.service (from rev 149345, minbif/trunk/minbif.service) =================================================================== --- community-staging-x86_64/minbif.service (rev 0) +++ community-staging-x86_64/minbif.service 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1,11 @@ +[Unit] +Description=minbif daemon + +[Service] +Type=forking +PIDFile=/run/minbif/minbif.pid +User=minbif +ExecStart=/usr/bin/minbif --pidfile /run/minbif/minbif.pid /etc/minbif/minbif.conf + +[Install] +WantedBy=multi-user.target Copied: minbif/repos/community-staging-x86_64/minbif.tmpfiles.conf (from rev 149345, minbif/trunk/minbif.tmpfiles.conf) =================================================================== --- community-staging-x86_64/minbif.tmpfiles.conf (rev 0) +++ community-staging-x86_64/minbif.tmpfiles.conf 2015-12-06 23:13:23 UTC (rev 149346) @@ -0,0 +1 @@ +d /run/minbif - minbif minbif -