minix/pkgsrc-ng
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git synced 2025-08-03 01:38:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Step 0: pkgtools/pkg_install

Browse Source 
* Add anti-recursivity checks when computing package dependancy,
   (Original author Thomas Cort)
This commit is contained in:
Lionel Sambuc 2013-10-08 13:15:25 +02:00 committed by Lionel Sambuc
parent c94e9e0e1c
commit f92b8b417b
3 changed files with 103 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgtools/pkg_install/Makefile
View File

@ -25,8 +25,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-pkgdbdir=${PKG_DBDIR}
USE_FEATURES= nbcompat
NBCOMPAT_CONFIGURE_ARGS+= --enable-bsd-getopt --enable-db
# MINIX: Unsupported for now, requires mmap: --enable-db
NBCOMPAT_CONFIGURE_ARGS+= --enable-bsd-getopt
SKIP_AUDIT_PACKAGES= yes
NO_PKGTOOLS_REQD_CHECK= yes
@ -78,7 +78,12 @@ CPPFLAGS+= -D_FILE_OFFSET_BITS=64
CPPFLAGS+= -DDEF_UMASK=${DEF_UMASK}
MAKE_ENV+= PKGSRC_MACHINE_ARCH=${MACHINE_ARCH}
.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
MAKE_ENV+= OPSYS=Minix
CPPFLAGS+= -DOPSYS_NAME=\"Minix\"
.else
MAKE_ENV+= OPSYS=${OPSYS}
.endif # ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
MAKE_ENV+= MANINSTALL=${MANINSTALL:Q}

90
pkgtools/pkg_install/files/add/perform.c
View File

@ -102,6 +102,13 @@ struct pkg_task {
char **dependencies;
};
struct dependency_chain {
const char *pkgpath;
struct dependency_chain *next;
};
static struct dependency_chain *dependency_chain = NULL;
static const struct pkg_meta_desc {
size_t entry_offset;
const char *entry_filename;
@ -127,6 +134,9 @@ static const struct pkg_meta_desc {
static int pkg_do(const char *, int, int);
static int dependency_push(const char *);
static void dependency_pop(void);
static int
end_of_version(const char *opsys, const char *version_end)
{
@ -748,7 +758,8 @@ extract_files(struct pkg_task *pkg)
continue;
case PLIST_CMD:
if (format_cmd(cmd, sizeof(cmd), p->name, pkg->prefix, last_file))
if (format_cmd(cmd, sizeof(cmd), p->name, pkg->install_prefix,
last_file))
return -1;
printf("Executing '%s'\n", cmd);
if (!Fake && system(cmd))
@ -1378,6 +1389,10 @@ pkg_do(const char *pkgpath, int mark_automatic, int top_level)
#endif
int status, invalid_sig;
struct pkg_task *pkg;
int rc;
if ((rc = dependency_push(pkgpath)) != 1)
return rc;
pkg = xcalloc(1, sizeof(*pkg));
@ -1577,6 +1592,7 @@ clean_memory:
free(pkg->pkgname);
clean_find_archive:
free(pkg);
dependency_pop();
return status;
}
@ -1593,5 +1609,77 @@ pkg_perform(lpkg_head_t *pkgs)
free_lpkg(lpp);
}
if (dependency_chain != NULL) { /* ensure stack is empty */
warnx("leaving pkg_perform with a non-empty stack.");
++errors;
}
return errors;
}
/*
* Add an element to the dependency chain and check for circular dependency
* while at it.
*
* returns 1 on success, 0 on circular dep detected, -1 on error.
*/
static int
dependency_push(const char *pkgpath)
{
struct dependency_chain *dep;
struct dependency_chain **last_pdep;
/* Check if that package is already in the chain. */
last_pdep = &dependency_chain;
for (dep = *last_pdep; dep; last_pdep = &(dep->next), dep = dep->next) {
if (strcmp(dep->pkgpath, pkgpath) == 0) {
/* Found it - that means we have a circular dependency */
fprintf(stderr, "warning: ignoring circular dependency:\n");
while (dep != NULL) {
fprintf(stderr, "- %s requires\n", dep->pkgpath);
dep = dep->next;
}
fprintf(stderr, "- %s\n", pkgpath);
return 0;
}
}
/* Not found. Add an entry to the end of the chain */
dep = (struct dependency_chain *)malloc(sizeof(struct dependency_chain));
if (dep == NULL) {
fprintf(stderr, "Out of memory in dependency_push for %s\n",
pkgpath);
return -1;
}
dep->pkgpath = pkgpath;
dep->next = NULL;
*last_pdep = dep;
return 1;
}
/*
* Remove the last entry from the dependency chain.
*/
static void
dependency_pop(void)
{
struct dependency_chain *dep = dependency_chain;
struct dependency_chain **pdep = &dependency_chain;
/* This should never happen */
if (dep == NULL) {
fprintf(stderr, "warning: empty dependency chain on pop\n");
return;
}
while (dep->next != NULL) {
pdep = &(dep->next);
dep = dep->next;
}
free(dep);
*pdep = NULL;
}

11
pkgtools/pkg_install/files/lib/plist.c
View File

@ -514,6 +514,7 @@ delete_package(Boolean ign_err, package_t *pkg, Boolean NoDeleteFiles,
int fail = SUCCESS;
Boolean preserve;
char tmp[MaxPathSize];
char cmd[MaxPathSize];
const char *prefix = NULL, *name = NULL;
if (!pkgdb_open(ReadWrite)) {
@ -580,10 +581,12 @@ delete_package(Boolean ign_err, package_t *pkg, Boolean NoDeleteFiles,
case PLIST_UNEXEC:
if (NoDeleteFiles)
break;
format_cmd(tmp, sizeof(tmp), p->name, prefix, last_file);
printf("Executing `%s'\n", tmp);
if (!Fake && system(tmp)) {
warnx("unexec command for `%s' failed", tmp);
(void) snprintf(tmp, sizeof(tmp), "%s%s%s",
destdir ? destdir : "", destdir ? "/" : "", prefix);
format_cmd(cmd, sizeof(cmd), p->name, tmp, last_file);
printf("Executing `%s'\n", cmd);
if (!Fake && system(cmd)) {
warnx("unexec command for `%s' failed", cmd);
fail = FAIL;
}
break;