782a42c Workaround for sysctl. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Workaround for sysctl.

Vsevolod Stakhov committed 11 years ago

commit 782a42c37742f0b71c863bed9c23ddc33d4fc2b2
parent 05d33ca

2 files changed +7 -1

modified configure.ac

@@ -156,6 +156,7 @@ AC_CHECK_FUNCS_ONCE([strtonum])

 AC_CHECK_FUNCS_ONCE([strnstr])
 AC_CHECK_FUNCS_ONCE([funopen])
 AC_CHECK_FUNCS_ONCE([fopencookie])
 AC_CHECK_FUNCS_ONCE([sysctlbyname])
 AC_CHECK_DECLS(
 	[[fstatat], [openat], [unlinkat], [readlinkat], [faccessat]],
 	[], [], [

modified libpkg/pkg_repo_create.c

@@ -28,6 +28,7 @@

  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "pkg_config.h"
 #include <sys/types.h>
 #include <sys/stat.h>

@@ -57,7 +58,7 @@

 #include "private/utils.h"
 #include "private/pkg.h"
 #include "private/pkgdb.h"
 #include "pkg_config.h"
 struct digest_list_entry {
 	char *origin;

@@ -579,8 +580,12 @@ pkg_create_repo(char *path, const char *output_dir, bool filelist,

 	num_workers = pkg_object_int(pkg_config_get("WORKERS_COUNT"));
 	if (num_workers <= 0) {
 		len = sizeof(num_workers);
 #ifdef HAVE_SYSCTLBYNAME
 		if (sysctlbyname("hw.ncpu", &num_workers, &len, NULL, 0) == -1)
 			num_workers = 6;
 #else
 		num_workers = 6;
 #endif
 	}
 	if ((fts = fts_open(repopath, FTS_PHYSICAL|FTS_NOCHDIR, NULL)) == NULL) {