c52e77f Linux does not support fflags — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Linux does not support fflags

Baptiste Daroussin committed 11 years ago

commit c52e77f2b60cc00d59592874c6b915031f03f30d
parent 91871d9

3 files changed +10 -2

modified configure.ac

@@ -154,6 +154,7 @@ AC_CHECK_HEADER([regex.h], [

 	[AC_MSG_ERROR([unable to find the regex.h header])],
 	[#include <sys/types.h>])
 AC_CHECK_FUNCS_ONCE([strtofflags])
 AC_CHECK_FUNCS_ONCE([posix_fallocate])
 AC_CHECK_FUNCS_ONCE([usleep])
 AC_CHECK_FUNCS_ONCE([localtime_r])

modified libpkg/pkg_ports.c

@@ -1018,11 +1018,16 @@ parse_keyword_args(char *args, char *keyword)

 	} while ((args = strchr(args, ',')) != NULL);
 	if (fflags != NULL && *fflags != '\0') {
 #ifdef HAVE_STRTOFFLAGS
 		if (strtofflags(&fflags, &fset, NULL) != 0) {
 			pkg_emit_error("Malformed keyword '%s', wrong fflags",
 			    keyword);
 			return (NULL);
 		}
 #else
 		pkg_emit_error("Malformed keyword '%s', maximum 3 arguments "
 		    "are accepted", keyword);
 #endif
 	}
 	if (permstr != NULL && *permstr != '\0') {

modified tests/frontend/create.shin

@@ -280,6 +280,8 @@ atf_init_test_cases() {

 	atf_add_test_case create_from_plist_mini
 	atf_add_test_case create_from_plist_dirrm
 	atf_add_test_case create_from_plist_ignore
 	atf_add_test_case create_from_plist_fflags
 	atf_add_test_case create_from_plist_bad_fflags
 	if [ `uname -s` != "Linux" ] ; then
 		atf_add_test_case create_from_plist_fflags
 		atf_add_test_case create_from_plist_bad_fflags
 	fi
 }