CVS commit: pkgsrc/net/proftpd

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Dec 19 12:52:28 UTC 2019

Modified Files:
        pkgsrc/net/proftpd: distinfo
        pkgsrc/net/proftpd/patches: patch-contrib_mod__load_mod__load.c

Log Message:
Fix patch or sys/loadavg.h

The patch for including sys/loadavg.h included the file in the section where
getloadavg isn't used so the patch did nothing. Include it in the right
place to fix it.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/proftpd/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c

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

Modified files:

Index: pkgsrc/net/proftpd/distinfo
diff -u pkgsrc/net/proftpd/distinfo:1.49 pkgsrc/net/proftpd/distinfo:1.50
--- pkgsrc/net/proftpd/distinfo:1.49    Mon Dec  9 19:22:57 2019
+++ pkgsrc/net/proftpd/distinfo Thu Dec 19 12:52:28 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2019/12/09 19:22:57 nros Exp $
+$NetBSD: distinfo,v 1.50 2019/12/19 12:52:28 nros Exp $
 
 SHA1 (proftpd-1.3.6.tar.gz) = 7e9269f9448c37f82e6faa9edaa3186ff5ba82d2
 RMD160 (proftpd-1.3.6.tar.gz) = 5da3934e46ea517ee6652382e5e3a9f87e591dd6
@@ -8,7 +8,7 @@ SHA1 (patch-Make.rules.in) = 4689fcb4aff
 SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421
 SHA1 (patch-configure.in) = ed8e190a89cbfc3276d9e77f0bbb624f6d19f816
 SHA1 (patch-contrib_mod__load_configure.in) = 0a72c47bf813ffd2ca8f8188a2d8596ec4d60200
-SHA1 (patch-contrib_mod__load_mod__load.c) = c99e79b3c63dd2c5a14361568e1e68966bd456c5
+SHA1 (patch-contrib_mod__load_mod__load.c) = c51abd46ffc950b5baec615a0fdaf92c993414e3
 SHA1 (patch-contrib_mod__load_mod__load.h.in) = 83f5592a9c9a2a90ec500bba382326dccf8f05e5
 SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee
 SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed

Index: pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c
diff -u pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c:1.1 pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c:1.2
--- pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c:1.1  Mon Dec  9 19:22:57 2019
+++ pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c      Thu Dec 19 12:52:28 2019
@@ -1,15 +1,15 @@
-$NetBSD: patch-contrib_mod__load_mod__load.c,v 1.1 2019/12/09 19:22:57 nros Exp $
+$NetBSD: patch-contrib_mod__load_mod__load.c,v 1.2 2019/12/19 12:52:28 nros Exp $
 * solaris and derivates has loadavg in sys/loadavg.h
---- contrib/mod_load/mod_load.c.orig   2019-12-09 18:07:41.734696143 +0000
+--- contrib/mod_load/mod_load.c.orig   2017-04-10 02:31:02.000000000 +0000
 +++ contrib/mod_load/mod_load.c
-@@ -303,6 +303,10 @@
- #  define LDAV_SYMBOL "avenrun"
- # endif
+@@ -49,6 +49,10 @@
+ # include <sys/param.h>
+ #endif
  
-+# ifdef HAVE_SYS_LOADAVG_H
-+#  include <sys/loadavg.h>
-+# endif
++#if defined (HAVE_SYS_LOADAVG_H)
++# include <sys/loadavg.h>
++#endif
 +
- # ifdef HAVE_UNISTD_H
- #  include <unistd.h>
- # endif
+ #ifndef HAVE_GETLOADAVG
+ # if !defined(LDAV_CVT) && defined(LOAD_AVE_CVT)
+ #  define LDAV_CVT(n) (LOAD_AVE_CVT (n) / 100.0)