[arch-commits] Commit in pork/trunk (3 files)

[Evangelos Foutras]

    Date: Monday, May 30, 2022 @ 16:48:11
  Author: foutrelis
Revision: 1216437

Fix build with Perl 5.36 and -Werror=format-security

Added:
  pork/trunk/fix-format-security.patch
  pork/trunk/perl-5.36.patch
Modified:
  pork/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   14 ++++++++++++--
 fix-format-security.patch |   24 ++++++++++++++++++++++++
 perl-5.36.patch           |   21 +++++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-30 16:14:20 UTC (rev 1216436)
+++ PKGBUILD	2022-05-30 16:48:11 UTC (rev 1216437)
@@ -9,11 +9,21 @@
 url="http://dev.ojnk.net/"
 license=('GPL')
 depends=('ncurses' 'perl')
-source=(https://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz{,.asc})
+source=(https://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz{,.asc}
+        fix-format-security.patch
+        perl-5.36.patch)
 sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed'
-            'SKIP')
+            'SKIP'
+            '1fa4ac8f5571f6a8f5f64da34607fc305be8f1aad9cdc5cfa64a00047a45cdc1'
+            'ff20edc7c939146c43a7cc5a3b95aa91b2fbcc2f908863438d6da9b464f7def3')
 validpgpkeys=('7A4533F19780BF32793C1820DAD25608075C69BC') # Ryan McCabe (Odin) <odin at numb.org>
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../fix-format-security.patch
+  patch -Np1 -i ../perl-5.36.patch
+}
+
 build() {
   cd $pkgname-$pkgver
 

Added: fix-format-security.patch
===================================================================
--- fix-format-security.patch	                        (rev 0)
+++ fix-format-security.patch	2022-05-30 16:48:11 UTC (rev 1216437)
@@ -0,0 +1,24 @@
+diff -upr pork-0.99.8.1.orig/src/pork_command.c pork-0.99.8.1/src/pork_command.c
+--- pork-0.99.8.1.orig/src/pork_command.c	2005-04-28 20:35:19.000000000 +0300
++++ pork-0.99.8.1/src/pork_command.c	2022-05-30 18:37:37.732536640 +0300
+@@ -2124,7 +2124,7 @@ USER_COMMAND(cmd_ctcp) {
+ 
+ USER_COMMAND(cmd_echo) {
+ 	if (args != NULL)
+-		screen_win_msg(cur_window(), 0, 0, 1, MSG_TYPE_CMD_OUTPUT, args);
++		screen_win_msg(cur_window(), 0, 0, 1, MSG_TYPE_CMD_OUTPUT, "%s", args);
+ }
+ 
+ USER_COMMAND(cmd_disconnect) {
+diff -upr pork-0.99.8.1.orig/src/pork_perl_xs.c pork-0.99.8.1/src/pork_perl_xs.c
+--- pork-0.99.8.1.orig/src/pork_perl_xs.c	2005-04-29 03:43:53.000000000 +0300
++++ pork-0.99.8.1/src/pork_perl_xs.c	2022-05-30 19:39:23.523379048 +0300
+@@ -289,7 +289,7 @@ XS(PORK_echo) {
+ 		XSRETURN_IV(-1);
+ 
+ 	msg = SvPV(ST(0), notused);
+-	screen_win_msg(cur_window(), 0, 0, 1, MSG_TYPE_CMD_OUTPUT, msg);
++	screen_win_msg(cur_window(), 0, 0, 1, MSG_TYPE_CMD_OUTPUT, "%s", msg);
+ 	XSRETURN_IV(0);
+ }
+ 

Added: perl-5.36.patch
===================================================================
--- perl-5.36.patch	                        (rev 0)
+++ perl-5.36.patch	2022-05-30 16:48:11 UTC (rev 1216437)
@@ -0,0 +1,21 @@
+diff -upr pork-0.99.8.1.orig/src/pork_perl_xs.c pork-0.99.8.1/src/pork_perl_xs.c
+--- pork-0.99.8.1.orig/src/pork_perl_xs.c	2005-04-29 03:43:53.000000000 +0300
++++ pork-0.99.8.1/src/pork_perl_xs.c	2022-05-30 19:44:04.119927388 +0300
+@@ -776,7 +776,7 @@ XS(PORK_send_msg) {
+ 	if (!acct->connected)
+ 		XSRETURN_IV(-1);
+ 
+-	return (XSRETURN_IV(pork_msg_send(acct, dest, msg)));
++	XSRETURN_IV(pork_msg_send(acct, dest, msg));
+ }
+ 
+ XS(PORK_send_msg_auto) {
+@@ -809,7 +809,7 @@ XS(PORK_send_msg_auto) {
+ 	if (!acct->connected)
+ 		XSRETURN_IV(-1);
+ 
+-	return (XSRETURN_IV(pork_msg_autoreply(acct, dest, msg)));
++	XSRETURN_IV(pork_msg_autoreply(acct, dest, msg));
+ }
+ 
+ XS(PORK_get_buddy_profile) {