[arch-commits] Commit in mcabber/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Friday, March 11, 2022 @ 20:39:10
  Author: arojas
Revision: 1148722

archrelease: copy trunk to community-x86_64

Added:
  mcabber/repos/community-x86_64/PKGBUILD
    (from rev 1148721, mcabber/trunk/PKGBUILD)
  mcabber/repos/community-x86_64/format-security.patch
    (from rev 1148721, mcabber/trunk/format-security.patch)
Deleted:
  mcabber/repos/community-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |   77 ++++++++++++++++++++++++++----------------------
 format-security.patch |   36 ++++++++++++++++++++++
 2 files changed, 78 insertions(+), 35 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-11 20:39:00 UTC (rev 1148721)
+++ PKGBUILD	2022-03-11 20:39:10 UTC (rev 1148722)
@@ -1,35 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
-# Contributor:  3ED <kas1987 at o2.pl>
-
-pkgname=mcabber
-pkgver=1.1.2
-pkgrel=1
-pkgdesc="A small Jabber console client, includes features: SSL, PGP, MUC, UTF8"
-arch=('x86_64')
-url="https://www.lilotux.net/~mikael/mcabber/"
-license=('GPL')
-depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr' 'aspell')
-makedepends=('pkg-config')
-validpgpkeys=('EACADFF156849BC89653139E3C2900DEACB7FC95')
-source=(https://www.lilotux.net/~mikael/mcabber/files/$pkgname-${pkgver/_/-}.tar.bz2{,.asc})
-sha256sums=('c4a1413be37434b6ba7d577d94afb362ce89e2dc5c6384b4fa55c3e7992a3160'
-            'SKIP')
-
-build() {
-  cd "${srcdir}"/$pkgname-${pkgver/_/-}
-  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
-  ./configure --prefix=/usr --enable-hgcset \
-      --mandir=/usr/share/man \
-      --enable-aspell --enable-otr
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-${pkgver/_/-}
-
-  make DESTDIR="${pkgdir}" install
-  mkdir -p "${pkgdir}"/usr/share/mcabber/example
-  cp -a "${srcdir}"/$pkgname-${pkgver/_/-}/mcabberrc.example \
-	"${pkgdir}"/usr/share/mcabber/example/mcabberrc
-}

Copied: mcabber/repos/community-x86_64/PKGBUILD (from rev 1148721, mcabber/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-03-11 20:39:10 UTC (rev 1148722)
@@ -0,0 +1,42 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
+# Contributor:  3ED <kas1987 at o2.pl>
+
+pkgname=mcabber
+pkgver=1.1.2
+pkgrel=2
+pkgdesc="A small Jabber console client, includes features: SSL, PGP, MUC, UTF8"
+arch=('x86_64')
+url="https://www.lilotux.net/~mikael/mcabber/"
+license=('GPL')
+depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr' 'aspell')
+makedepends=('pkg-config')
+validpgpkeys=('EACADFF156849BC89653139E3C2900DEACB7FC95')
+source=(https://www.lilotux.net/~mikael/mcabber/files/$pkgname-${pkgver/_/-}.tar.bz2{,.asc}
+        format-security.patch)
+sha256sums=('c4a1413be37434b6ba7d577d94afb362ce89e2dc5c6384b4fa55c3e7992a3160'
+            'SKIP'
+            'f075365bda322b9808f0ddf60390b243b54c7148cf01d261341f293cf7c46279')
+
+prepare() {
+  cd $pkgname-${pkgver/_/-}
+  patch -p2 -i ../format-security.patch # Fix format-security warnings
+}
+
+build() {
+  cd "${srcdir}"/$pkgname-${pkgver/_/-}
+  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+  ./configure --prefix=/usr --enable-hgcset \
+      --mandir=/usr/share/man \
+      --enable-aspell --enable-otr
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-${pkgver/_/-}
+
+  make DESTDIR="${pkgdir}" install
+  mkdir -p "${pkgdir}"/usr/share/mcabber/example
+  cp -a "${srcdir}"/$pkgname-${pkgver/_/-}/mcabberrc.example \
+	"${pkgdir}"/usr/share/mcabber/example/mcabberrc
+}

Copied: mcabber/repos/community-x86_64/format-security.patch (from rev 1148721, mcabber/trunk/format-security.patch)
===================================================================
--- format-security.patch	                        (rev 0)
+++ format-security.patch	2022-03-11 20:39:10 UTC (rev 1148722)
@@ -0,0 +1,36 @@
+--- a/mcabber/mcabber/screen.c	Sun Oct 24 18:22:01 2021 +0200
++++ b/mcabber/mcabber/screen.c	Sun Oct 24 21:20:36 2021 +0200
+@@ -1278,12 +1278,12 @@
+         tmp = pref[timelen];
+         pref[timelen] = '\0';
+         wbkgdset(win_entry->win, get_color(COLOR_TIMESTAMP));
+-        wprintw(win_entry->win, pref);
++        wprintw(win_entry->win, "%s", pref);
+         pref[timelen] = tmp;
+         wbkgdset(win_entry->win, get_color(color));
+-        wprintw(win_entry->win, pref+timelen);
++        wprintw(win_entry->win, "%s", pref+timelen);
+       } else
+-        wprintw(win_entry->win, pref);
++        wprintw(win_entry->win, "%s", pref);
+ 
+       // Make sure we are at the right position
+       wmove(win_entry->win, winy, prefixwidth-1);
+@@ -1362,7 +1362,7 @@
+         wmove(win_entry->win, winy, 0);
+         wbkgdset(win_entry->win, get_color(COLOR_READMARK));
+         g_snprintf(pref, prefixwidth, "             == ");
+-        wprintw(win_entry->win, pref);
++        wprintw(win_entry->win, "%s", pref);
+         w = scr_gettextwidth() / 3;
+         for (i=0; i<w; i++)
+           wprintw(win_entry->win, "== ");
+@@ -1782,7 +1782,7 @@
+ 
+   ver = mcabber_version();
+   message = g_strdup_printf("MCabber version %s.\n", ver);
+-  mvwprintw(chatWnd, 0, 0, message);
++  mvwprintw(chatWnd, 0, 0, "%s", message);
+   mvwprintw(chatWnd, 1, 0, "http://mcabber.com/");
+   g_free(ver);
+   g_free(message);