CVS commit: pkgsrc/security/pgp2

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Fri Oct 10 19:11:59 UTC 2025

Modified Files:
        pkgsrc/security/pgp2: distinfo
Added Files:
        pkgsrc/security/pgp2/patches: patch-src_getopt.h patch-src_more.c

Log Message:
make sure prototypes are present.

pgp_getopt() is always the name used, so make it's prototype always there.
also include <sys/ioctl.h> on netbsd to get ioctl() prototype.

fixes GCC 14 build.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/pgp2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/pgp2/patches/patch-src_getopt.h \
    pkgsrc/security/pgp2/patches/patch-src_more.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/pgp2/distinfo
diff -u pkgsrc/security/pgp2/distinfo:1.10 pkgsrc/security/pgp2/distinfo:1.11
--- pkgsrc/security/pgp2/distinfo:1.10  Tue Oct 26 11:17:36 2021
+++ pkgsrc/security/pgp2/distinfo       Fri Oct 10 19:11:59 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:17:36 nia Exp $
+$NetBSD: distinfo,v 1.11 2025/10/10 19:11:59 mrg Exp $
 
 BLAKE2s (pgp263is.tar.gz) = 2f8d378b8beb48f20debf272614ebb6745e1624c1b0d4b722f292f30d1ae70e9
 SHA512 (pgp263is.tar.gz) = ced42d884f8dbbc7afc2dfbe485716333df5fa04a5727dc63fa3c7504e53447a7561d7406a057fba18e6239836e40cc13de4b30f2223552c6dc3dae0664a4374
@@ -12,3 +12,5 @@ SHA1 (patch-af) = 6f58d2b26a16886947f2e5
 SHA1 (patch-ag) = 377b17bc3783737c492708de57d6f4259e358a66
 SHA1 (patch-ah) = 15fe0597566ad8bf3123a54d3697e104e85ee425
 SHA1 (patch-ai) = 3afafb582e229e70721d7ee96d25d7d1d006d870
+SHA1 (patch-src_getopt.h) = 74f357ab6b7aa8f2b547406f02a396bdfd26edad
+SHA1 (patch-src_more.c) = 1ea335fdd77c4ea71fdb1f53a00e465765f2d09f

Added files:

Index: pkgsrc/security/pgp2/patches/patch-src_getopt.h
diff -u /dev/null pkgsrc/security/pgp2/patches/patch-src_getopt.h:1.1
--- /dev/null   Fri Oct 10 19:11:59 2025
+++ pkgsrc/security/pgp2/patches/patch-src_getopt.h     Fri Oct 10 19:11:59 2025
@@ -0,0 +1,11 @@
+$NetBSD: patch-src_getopt.h,v 1.1 2025/10/10 19:11:59 mrg Exp $
+
+Make sure the prototype for pgp_getopt() is present, even for UNIX builds.
+
+--- getopt.h.orig      1995-08-09 00:34:07.000000000 -0700
++++ getopt.h   2025-10-10 12:05:20.586563908 -0700
+@@ -1,4 +1,2 @@
+-#ifndef UNIX  /* avoid conflict with stdlib.h */
+ int pgp_getopt(int argc, char * const argv[], const char *opts);
+-#endif
+ 
Index: pkgsrc/security/pgp2/patches/patch-src_more.c
diff -u /dev/null pkgsrc/security/pgp2/patches/patch-src_more.c:1.1
--- /dev/null   Fri Oct 10 19:11:59 2025
+++ pkgsrc/security/pgp2/patches/patch-src_more.c       Fri Oct 10 19:11:59 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_more.c,v 1.1 2025/10/10 19:11:59 mrg Exp $
+
+Also include sys/ioctl.h on NetBSD.
+
+
+--- more.c.orig        1996-01-06 11:54:04.000000000 -0800
++++ more.c     2025-10-10 12:07:52.897573874 -0700
+@@ -107,7 +107,7 @@ extern int tgetent(), tgetnum();
+ #endif                                /* SVR2 */
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/ioctl.h>          /* for ioctl() prototype too */
+ #else
+ #ifndef SVR2