[arch-commits] Commit in minbif/repos/community-x86_64 (12 files)
Eli Schwartz
eschwartz at archlinux.org
Tue Jan 9 20:10:11 UTC 2018
Date: Tuesday, January 9, 2018 @ 20:10:11
Author: eschwartz
Revision: 280756
archrelease: copy trunk to community-x86_64
Added:
minbif/repos/community-x86_64/PKGBUILD
(from rev 280755, minbif/trunk/PKGBUILD)
minbif/repos/community-x86_64/minbif-gcc-4.7.patch
(from rev 280755, minbif/trunk/minbif-gcc-4.7.patch)
minbif/repos/community-x86_64/minbif-imlib.patch
(from rev 280755, minbif/trunk/minbif-imlib.patch)
minbif/repos/community-x86_64/minbif.service
(from rev 280755, minbif/trunk/minbif.service)
minbif/repos/community-x86_64/minbif.sysusers.conf
(from rev 280755, minbif/trunk/minbif.sysusers.conf)
minbif/repos/community-x86_64/minbif.tmpfiles.conf
(from rev 280755, minbif/trunk/minbif.tmpfiles.conf)
Deleted:
minbif/repos/community-x86_64/PKGBUILD
minbif/repos/community-x86_64/minbif-gcc-4.7.patch
minbif/repos/community-x86_64/minbif-imlib.patch
minbif/repos/community-x86_64/minbif.install
minbif/repos/community-x86_64/minbif.service
minbif/repos/community-x86_64/minbif.tmpfiles.conf
----------------------+
PKGBUILD | 98 ++++++++++++------------
minbif-gcc-4.7.patch | 196 ++++++++++++++++++++++++-------------------------
minbif-imlib.patch | 38 ++++-----
minbif.install | 9 --
minbif.service | 22 ++---
minbif.sysusers.conf | 1
minbif.tmpfiles.conf | 4 -
7 files changed, 180 insertions(+), 188 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-09 20:09:23 UTC (rev 280755)
+++ PKGBUILD 2018-01-09 20:10:11 UTC (rev 280756)
@@ -1,50 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: AkiraYB <brunoyb!yahoo,com,br>
-
-pkgname=minbif
-pkgver=1.0.5
-pkgrel=7
-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-x86_64/PKGBUILD (from rev 280755, minbif/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-09 20:10:11 UTC (rev 280756)
@@ -0,0 +1,48 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: AkiraYB <brunoyb!yahoo,com,br>
+
+pkgname=minbif
+pkgver=1.0.5
+pkgrel=8
+pkgdesc='An IRC gateway to IM networks that uses libpurple.'
+arch=('x86_64')
+url='https://symlink.me/projects/minbif/wiki/'
+license=('GPL2')
+depends=('gnutls' 'libcaca' 'libpurple')
+makedepends=('cmake')
+optdepends=('xinetd: to run minbif through xinetd')
+backup=('etc/minbif/minbif.conf'
+ 'etc/minbif/minbif.motd')
+source=("https://symlink.me/attachments/download/148/${pkgname}-${pkgver}.tar.gz"
+ 'minbif-gcc-4.7.patch'
+ 'minbif-imlib.patch'
+ 'minbif.service'
+ 'minbif.sysusers.conf'
+ 'minbif.tmpfiles.conf')
+md5sums=('00c5c1abbe2b8a9d900961832c7909a8'
+ '2235c45d5bdb01e9ef4b11d2a41d49bb'
+ 'c94ea3152b7d279da25947e0d1deff14'
+ 'b34876e339a37dfb1dc6cd0b9d8edf9d'
+ 'f1a35ef1ab6cb2af5e5b1843b4b6a0d6'
+ 'a9835ad61bbb62b1b369b8710de05ffd')
+
+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}"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm0644 "${srcdir}/minbif.service" "${pkgdir}/usr/lib/systemd/system/minbif.service"
+ install -Dm0644 "${srcdir}/minbif.sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/minbif.conf"
+ install -Dm0644 "${srcdir}/minbif.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/minbif.conf"
+}
Deleted: minbif-gcc-4.7.patch
===================================================================
--- minbif-gcc-4.7.patch 2018-01-09 20:09:23 UTC (rev 280755)
+++ minbif-gcc-4.7.patch 2018-01-09 20:10:11 UTC (rev 280756)
@@ -1,98 +0,0 @@
-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-x86_64/minbif-gcc-4.7.patch (from rev 280755, minbif/trunk/minbif-gcc-4.7.patch)
===================================================================
--- minbif-gcc-4.7.patch (rev 0)
+++ minbif-gcc-4.7.patch 2018-01-09 20:10:11 UTC (rev 280756)
@@ -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
Deleted: minbif-imlib.patch
===================================================================
--- minbif-imlib.patch 2018-01-09 20:09:23 UTC (rev 280755)
+++ minbif-imlib.patch 2018-01-09 20:10:11 UTC (rev 280756)
@@ -1,19 +0,0 @@
-commit 7aaf2a24260cabbfc04791291160a4100e550b5a
-Author: Romain Bignon <romain at 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-x86_64/minbif-imlib.patch (from rev 280755, minbif/trunk/minbif-imlib.patch)
===================================================================
--- minbif-imlib.patch (rev 0)
+++ minbif-imlib.patch 2018-01-09 20:10:11 UTC (rev 280756)
@@ -0,0 +1,19 @@
+commit 7aaf2a24260cabbfc04791291160a4100e550b5a
+Author: Romain Bignon <romain at 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. */
Deleted: minbif.install
===================================================================
--- minbif.install 2018-01-09 20:09:23 UTC (rev 280755)
+++ minbif.install 2018-01-09 20:10:11 UTC (rev 280756)
@@ -1,9 +0,0 @@
-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
-}
-
-post_upgrade() {
- post_install $1
-}
Deleted: minbif.service
===================================================================
--- minbif.service 2018-01-09 20:09:23 UTC (rev 280755)
+++ minbif.service 2018-01-09 20:10:11 UTC (rev 280756)
@@ -1,11 +0,0 @@
-[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-x86_64/minbif.service (from rev 280755, minbif/trunk/minbif.service)
===================================================================
--- minbif.service (rev 0)
+++ minbif.service 2018-01-09 20:10:11 UTC (rev 280756)
@@ -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-x86_64/minbif.sysusers.conf (from rev 280755, minbif/trunk/minbif.sysusers.conf)
===================================================================
--- minbif.sysusers.conf (rev 0)
+++ minbif.sysusers.conf 2018-01-09 20:10:11 UTC (rev 280756)
@@ -0,0 +1 @@
+u minbif 67 - /var/lib/minbif
Deleted: minbif.tmpfiles.conf
===================================================================
--- minbif.tmpfiles.conf 2018-01-09 20:09:23 UTC (rev 280755)
+++ minbif.tmpfiles.conf 2018-01-09 20:10:11 UTC (rev 280756)
@@ -1 +0,0 @@
-d /run/minbif - minbif minbif -
Copied: minbif/repos/community-x86_64/minbif.tmpfiles.conf (from rev 280755, minbif/trunk/minbif.tmpfiles.conf)
===================================================================
--- minbif.tmpfiles.conf (rev 0)
+++ minbif.tmpfiles.conf 2018-01-09 20:10:11 UTC (rev 280756)
@@ -0,0 +1,3 @@
+d /run/minbif - minbif minbif -
+d /var/lib/minbif 0770 minbif minbif -
+d /var/lib/minbif/users 0770 minbif minbif -
More information about the arch-commits
mailing list