CVS commit: pkgsrc/pkgtools/pkg_install/files/lib

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   agc
Date:           Wed Nov  8 01:24:29 UTC 2023

Modified Files:
        pkgsrc/pkgtools/pkg_install/files/lib: pkg_io.c

Log Message:
Fix PR pkg/55401 from Sevan Janiyan, and after some testing and
encouragement from David Holland, and also the younger generation -
apply the fix from the PR.

Thanks for the PR, the fix, and the nudges, folks, and sorry it took so long!


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/pkgtools/pkg_install/files/lib/pkg_io.c

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

Modified files:

Index: pkgsrc/pkgtools/pkg_install/files/lib/pkg_io.c
diff -u pkgsrc/pkgtools/pkg_install/files/lib/pkg_io.c:1.13 pkgsrc/pkgtools/pkg_install/files/lib/pkg_io.c:1.14
--- pkgsrc/pkgtools/pkg_install/files/lib/pkg_io.c:1.13 Sun Jul 16 16:51:48 2017
+++ pkgsrc/pkgtools/pkg_install/files/lib/pkg_io.c      Wed Nov  8 01:24:29 2023
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkg_io.c,v 1.13 2017/07/16 16:51:48 joerg Exp $        */
+/*     $NetBSD: pkg_io.c,v 1.14 2023/11/08 01:24:29 agc Exp $  */
 /*-
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
  * All rights reserved.
@@ -36,7 +36,7 @@
 #include <sys/cdefs.h>
 #endif
 
-__RCSID("$NetBSD: pkg_io.c,v 1.13 2017/07/16 16:51:48 joerg Exp $");
+__RCSID("$NetBSD: pkg_io.c,v 1.14 2023/11/08 01:24:29 agc Exp $");
 
 #include <archive.h>
 #include <archive_entry.h>
@@ -48,6 +48,8 @@ __RCSID("$NetBSD: pkg_io.c,v 1.13 2017/0
 #endif
 #include <stdlib.h>
 
+#include "lib.h"
+
 #ifdef BOOTSTRAP
 #undef IS_URL
 #define IS_URL(x) 0
@@ -55,8 +57,6 @@ __RCSID("$NetBSD: pkg_io.c,v 1.13 2017/0
 #include <fetch.h>
 #endif
 
-#include "lib.h"
-
 struct pkg_path {
        TAILQ_ENTRY(pkg_path) pl_link;
        char *pl_path;