Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 765e51f
Merge branch 'master' into osx/main
Landon Fuller committed 11 years ago
commit 765e51fa595bee34d9d30c69bfee988f6f6319dd
parent 267e597
8 files changed +47 -18
modified README.md
@@ -81,28 +81,35 @@ information about the package:
	users: [USER1, USER2]

	groups: [GROUP1, GROUP2]

	options: { OPT1: off, OPT2: on }
- 
	desc: |-
+ 
	desc: <<EOD

	  This is the description

	  Of foo

	  

	  A component of bar
+ 
	EOD

	categories: [bar, plop]
- 
	deps:
- 
	  libiconv: {origin: converters/libiconv, version: 1.13.1_2}
- 
	  perl: {origin: lang/perl5.12, version: 5.12.4 }
- 
	files:
- 
	  /usr/local/bin/foo: 'sha256sum'
- 
	  /usr/local/bin/i_am_a_link: '-'
- 
	  /usr/local/share/foo-1.0/foo.txt: 'sha256sum'
- 
	dirs:
- 
	- /usr/local/share/foo-1.0
- 
	scripts:
- 
	  post-install: |-
+ 
	deps: {
+ 
	  libiconv: {origin: converters/libiconv, version: 1.13.1_2};
+ 
	  perl: {origin: lang/perl5.12, version: 5.12.4 };
+ 
	}
+ 
	files: {
+ 
	  /usr/local/bin/foo: 'sha256sum',
+ 
	  /usr/local/bin/i_am_a_link: '-';
+ 
	  /usr/local/share/foo-1.0/foo.txt: 'sha256sum;
+ 
	}
+ 
	directories: {
+ 
	  /usr/local/share/foo-1.0 : 'y';
+ 
	}
+ 
	scripts: {
+ 
	  post-install: <<EOD

	    #!/bin/sh

	    echo post-install
- 
	  pre-install: |-
+ 
	EOD
+ 
	  pre-install: <<EOD

	    #!/bin/sh

	    echo pre-install
+ 
	EOD
+ 
	}



Valid scripts are:
modified dev_version.m4
@@ -1 +1 @@
- 
0
+ 
1
modified libpkg/libpkg.ver
@@ -129,6 +129,7 @@ global:
	pkg_sbuf_vprintf;

	pkg_script_get;

	pkg_set2;
+ 
	pkg_set_debug_level;

	pkg_set_from_file;

	pkg_set_from_fileat;

	pkg_shlibs_provided;
modified libpkg/merge3.c
@@ -153,7 +153,6 @@ sbuf_merge(char *pPivot, char *pV1, char *pV2, struct sbuf *pOut){
  int i1, i2;            /* Index into aC1[] and aC2[] */

  int nCpy, nDel, nIns;  /* Number of lines to copy, delete, or insert */

  int limit1, limit2;    /* Sizes of aC1[] and aC2[] */
- 
  int nConflict = 0;     /* Number of merge conflicts seen so far */



  sbuf_clear(pOut);         /* Merge results stored in pOut */
@@ -249,7 +248,7 @@ sbuf_merge(char *pPivot, char *pV1, char *pV2, struct sbuf *pOut){


  free(aC1);

  free(aC2);
- 
  return nConflict;
+ 
  return 0;

}



/*
modified libpkg/pkg.h.in
@@ -696,6 +696,13 @@ int pkg_set_from_file(struct pkg *pkg, pkg_attr attr, const char *file, bool tri
int pkg_set_from_fileat(int fd, struct pkg *pkg, pkg_attr attr, const char *file, bool trimcr);



/**
+ 
 * Set a new debug level used inside of pkg.
+ 
 * @param debug_level Debug level between 0 (no debugging) and 4 (max debugging).
+ 
 * @return Previous debug level.
+ 
 */
+ 
int64_t pkg_set_debug_level(int64_t debug_level);
+
+ 
/**

 * Allocate a new struct pkg and add it to the deps of pkg.

 * @return An error code.

 */
modified libpkg/pkg_config.c
@@ -1211,3 +1211,11 @@ pkg_repo_find(const char *reponame)
	HASH_FIND_STR(repos, reponame, r);

	return (r);

}
+
+ 
int64_t
+ 
pkg_set_debug_level(int64_t new_debug_level) {
+ 
	int64_t old_debug_level = debug_level;
+
+ 
	debug_level = new_debug_level;
+ 
	return old_debug_level;
+ 
}
modified libpkg/pkg_delete.c
@@ -187,7 +187,9 @@ rmdir_p(struct pkgdb *db, struct pkg *pkg, char *dir, const char *prefix_r)
	if (unlinkat(pkg->rootfd, dir, AT_REMOVEDIR) == -1) {

		if (errno != ENOTEMPTY && errno != EBUSY)

			pkg_emit_errno("unlinkat", dir);
- 
		return;
+ 
		/* If the directory was already removed by a bogus script, continue removing parents */
+ 
		if (errno != ENOENT)
+ 
			return;

	}



	/* No recursivity for packages out of the prefix */
modified src/main.c
@@ -554,7 +554,7 @@ main(int argc, char **argv)
	const char	 *jail_str = NULL;

	size_t		  len;

	signed char	  ch;
- 
	int		  debug = 0;
+ 
	int64_t		  debug = 0;

	int		  version = 0;

	int		  ret = EX_OK;

	bool		  plugins_enabled = false;
@@ -652,6 +652,8 @@ main(int argc, char **argv)
	argc -= optind;

	argv += optind;
+ 
	pkg_set_debug_level(debug);
+ 


	if (version == 1)

		show_version_info(version);
@@ -705,6 +707,9 @@ main(int argc, char **argv)
	if (pkg_ini(conffile, reposdir, init_flags) != EPKG_OK)

		errx(EX_SOFTWARE, "Cannot parse configuration file!");
+ 
	if (debug > 0)
+ 
		pkg_set_debug_level(debug);
+ 


	if (atexit(&pkg_shutdown) != 0)

		errx(EX_SOFTWARE, "register pkg_shutdown() to run at exit");