Received: by mail.netbsd.org (Postfix, from userid 605) id E3DEC84D73; Thu, 19 Dec 2019 12:52:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6A74784D68 for ; Thu, 19 Dec 2019 12:52:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id j9Grd5RmKYfM for ; Thu, 19 Dec 2019 12:52:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D37BD84D2A for ; Thu, 19 Dec 2019 12:52:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C2147FA97; Thu, 19 Dec 2019 12:52:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1576759948176340" MIME-Version: 1.0 Date: Thu, 19 Dec 2019 12:52:28 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/net/proftpd To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20191219125228.C2147FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1576759948176340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1576759948176340 Content-Disposition: inline Content-Length: 2507 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 + #endif -+# ifdef HAVE_SYS_LOADAVG_H -+# include -+# endif ++#if defined (HAVE_SYS_LOADAVG_H) ++# include ++#endif + - # ifdef HAVE_UNISTD_H - # include - # endif + #ifndef HAVE_GETLOADAVG + # if !defined(LDAV_CVT) && defined(LOAD_AVE_CVT) + # define LDAV_CVT(n) (LOAD_AVE_CVT (n) / 100.0) --_----------=_1576759948176340--