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

[Antonio Rojas]

    Date: Friday, March 11, 2022 @ 21:02:03
  Author: arojas
Revision: 1148742

archrelease: copy trunk to community-x86_64

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

-----------------------+
 PKGBUILD              |   66 +++++++++++++++++++++++++-----------------------
 format-security.patch |   21 +++++++++++++++
 2 files changed, 56 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-11 21:01:52 UTC (rev 1148741)
+++ PKGBUILD	2022-03-11 21:02:03 UTC (rev 1148742)
@@ -1,31 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=netwatch
-pkgver=1.3.1_2
-pkgrel=2
-pkgdesc="monitor network connections"
-arch=(x86_64)
-url="http://www.slctech.org/~mackay/NETWATCH/netwatch.html"
-license=('GPL')
-options=(zipman)
-depends=(ncurses)
-source=(https://www.slctech.org/~mackay/NETWATCH/netwatch-${pkgver/_/-}.tgz)
-sha256sums=('9374fa55a41a4addd8897f1ff10a3453c840bf28534f500e8661a614231cc161')
-
-prepare() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
-  sed -i 's|${CC-cc} |${CC-cc} -O2 |g' configure
-}
-
-build() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
-  install -D -m0755 netwatch "$pkgdir"/usr/bin/netwatch
-  install -D -m0755 netresolv "$pkgdir"/usr/bin/netresolv
-  install -D -m0644 netwatch.1 "$pkgdir"/usr/share/man/man1/netwatch.1
-}

Copied: netwatch/repos/community-x86_64/PKGBUILD (from rev 1148741, netwatch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-03-11 21:02:03 UTC (rev 1148742)
@@ -0,0 +1,35 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=netwatch
+pkgver=1.3.1_2
+pkgrel=3
+pkgdesc="monitor network connections"
+arch=(x86_64)
+url="http://www.slctech.org/~mackay/NETWATCH/netwatch.html"
+license=('GPL')
+options=(zipman)
+depends=(ncurses)
+source=(https://www.slctech.org/~mackay/NETWATCH/netwatch-${pkgver/_/-}.tgz
+        format-security.patch)
+sha256sums=('9374fa55a41a4addd8897f1ff10a3453c840bf28534f500e8661a614231cc161'
+            'cc7356f59127c16ed43f402cc588c59e8b017dceaacd5a5d9a10080b7b8eb59c')
+
+prepare() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  sed -i 's|${CC-cc} |${CC-cc} -O2 |g' configure
+  patch -p1 -i ../format-security.patch # Fix format-security warnings
+}
+
+build() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  export CFLAGS+=" -fcommon" # Fix build with GCC 10m
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  install -D -m0755 netwatch "$pkgdir"/usr/bin/netwatch
+  install -D -m0755 netresolv "$pkgdir"/usr/bin/netresolv
+  install -D -m0644 netwatch.1 "$pkgdir"/usr/share/man/man1/netwatch.1
+}

Copied: netwatch/repos/community-x86_64/format-security.patch (from rev 1148741, netwatch/trunk/format-security.patch)
===================================================================
--- format-security.patch	                        (rev 0)
+++ format-security.patch	2022-03-11 21:02:03 UTC (rev 1148742)
@@ -0,0 +1,21 @@
+diff -ru netwatch-1.3.1-2.orig/dispdata.c netwatch-1.3.1-2/dispdata.c
+--- netwatch-1.3.1-2.orig/dispdata.c	2022-03-11 21:56:12.752986724 +0100
++++ netwatch-1.3.1-2/dispdata.c	2022-03-11 21:57:36.180151654 +0100
+@@ -1488,7 +1488,7 @@
+ 	      fprintf (fpspeclog, "%s\n", ttt);
+ 	    else
+ 	      //!!mvprintw (yact, xleft, "%s",ttt);
+-	      mvprintw (yact, xleft, ttt);
++	      mvprintw (yact, xleft, "%s", ttt);
+ 	    attron (col4);
+ 	    if (current->update)
+ 	    {
+@@ -1736,7 +1736,7 @@
+ 	      fprintf (fpspeclog, "%s\n", ttt);
+ 	    else
+ 	      //!!mvprintw (yact, xright,"%s", ttt);
+-	      mvprintw (yact, xright, ttt);
++	      mvprintw (yact, xright, "%s", ttt);
+ 	    attron (col4);
+ 	    if (current->update)
+ 	    {