Merge branch 'master' into fixes

* master:
  bee-remove: Remove --noop option..
  bee-remove: Use BEE_VERSION in usage
  bee-remove: Add bee-query wrapper function
  bee-remove: Cleanup: move bee-cache wrapper function to the top
  bee-remove: Add bee-list wrapper function
  bee-remove: Define BEE_LIBEXECDIR if not set
  bee-remove: Use function keyword for functions
  bee-remove: rerun bee-cache update after metadir was removed
  bee-cache-update: cleanup cachedir if metadir does not exist
  bee-cache: Fix print-conflicts
  bee-install: deprecate DEPENDENCIES file
  bee-cache/bee-dep: Remove old bee-dep
  bee-install: Change conflict output
  beesh: Show conflicts with installed packages
  bee-install: Print conflicts after installing/updating a package
  bee-cache: Add new command 'print-conflicts'
  bee-cache: Introduce new --fields option
  bee-cache: Add new command 'print-conflicting-files'
  bee-cache: Add new tool to manage inventory
  bee-cache-update: Preserve uniqueness of inventory entries..
  bee-cache-update: reverse sort INVENTORY
  bee-cache-update: Use CONTENT.bee-remove to create .bcr file
  bee-remove: Change suffix of renamed CONTENT file
  bee-remove: Only remove packages that have a CONTENT file
  devel: Bump version to 1.1.99
  bee-cache-inventory: set size of directories to zero
  Revert "gitignore: add bee-cache-inventory"
  bee-cache-inventory: Rewrite I/O file verification
  bee-cache-inventory: Always match va_start with va_end
  bee-cache-inventory: Minor cleanup
  bee-cache-inventory: Minor cleanup usage of goto
  bee-cache-inventory: Cleanup variable reuses
  bee-cache-inventory: Fix memory leak
  bee-install/bee-remove: Add INVENTORY support
  Revert "bci: Ignore ENOTDIR for regular files while scanning directories"
  bee-cache-update: rename pkg-inventory file instead of removing it
  Makefile: remove compiler and linker debug options
  bci: speed up filename creation
  bci: remove debug output
  bci: add sync
  bci: merge fopen_*fname(...) finctions to single fopenf(...) function
  bci: fix memory leak
  bci: fix error messages
  gitignore: add bee-cache-inventory
  bee-cache-inventory: output will bee stored in temporary files
  bee-cache-inventory: rewrite opening process
  bci: Ignore ENOTDIR for regular files while scanning directories
  bee-cache-update: Output more information about progress
  bee-cache-update: Remove missing packages from INVENTORY
  bee-cache-update: new helper to manage inventory
  Makefile: install bee-cache-inventory as helper in libexec dir
  bci: remove trailing slashes from pathname
  bci: cleanup 3 error messages
  bci: minor syntax cleanup
  bci: Detect corrupt CONTENT files bug
  bee-cache-inventory: Assert newline
  bee-cache-inventory: Save one alloc/free per input line
  bee-cache-inventory: Fix unchecked strdup()
  bee-cache-inventory: Minor syntax cleanup
  bee-cache-inventory: Optimize skipping special directories
  bee-cache-inventory: Add missing 'mode' in output
  bee-cache-inventory: Replace extract macro with inline function
  bee-cache-inventory: new tool to convert CONTENT file to inventory structure

.gitignore

@@ -1,4 +1,5 @@
 /bee.sh
+/bee-cache.sh
 /bee-check.sh
 /bee-init.sh
 /bee-install.sh
@@ -16,7 +17,6 @@
 /beeversion
 /beegetopt
 /beeflock
-/bee-dep
 /beelib.config.sh
 /bee.1
 /bee-check.1
@@ -25,8 +25,9 @@
 /bee-list.1
 /bee-query.1
 /bee-remove.1
-/bee-dep.1
 /beefind.sh
+/bee-cache-inventory
+/bee-cache-update.sh
 /compat-filesfile2contentfile.sh
 /compat-fixmetadir.sh
 /content2filelist.sh

Makefile

@@ -1,4 +1,4 @@
-BEE_VERSION = 1.1
+BEE_VERSION = 1.1.99
 
 CC=gcc
 CFLAGS=-Wall -g
@@ -64,8 +64,7 @@ PROGRAMS_SHELL+=bee
 PROGRAMS_SHELL+=beefind
 PROGRAMS_SHELL+=beesh
 
-HELPER_BEE_C+=bee-dep
-
+HELPER_BEE_SHELL+=bee-cache
 HELPER_BEE_SHELL+=bee-check
 HELPER_BEE_SHELL+=bee-download
 HELPER_BEE_SHELL+=bee-init
@@ -75,10 +74,13 @@ HELPER_BEE_SHELL+=bee-query
 HELPER_BEE_SHELL+=bee-remove
 HELPER_BEE_SHELL+=bee-update
 
+HELPER_C+=bee-cache-inventory
+
 HELPER_SHELL+=compat-filesfile2contentfile
 HELPER_SHELL+=compat-fixmetadir
 HELPER_SHELL+=content2filelist
 HELPER_SHELL+=filelist2content
+HELPER_SHELL+=bee-cache-update
 
 LIBRARY_SHELL+=beelib.config.sh
 
@@ -104,7 +106,6 @@ HELPER_HOOKS_SHELL+=gconf-install-schemas
 
 MANPAGES+=bee.1
 MANPAGES+=bee-check.1
-MANPAGES+=bee-dep.1
 MANPAGES+=bee-download.1
 MANPAGES+=bee-list.1
 MANPAGES+=bee-init.1
@@ -142,15 +143,15 @@ BEESEP_OBJECTS=beesep.o
 BEECUT_OBJECTS=beecut.o
 BEEUNIQ_OBJECTS=beeuniq.o
 BEESORT_OBJECTS=bee_tree.o bee_version_compare.o bee_version_output.o bee_version_parse.o bee_getopt.o beesort.o
-BEEDEP_OBJECTS=bee-dep.o graph.o hash.o beedep_tree.o node.o
 BEEGETOPT_OBJECTS=bee_getopt.o beegetopt.o
 BEEFLOCK_OBJECTS=bee_getopt.o beeflock.o
+BEECACHEINVENTORY_OBJECTS=bee-cache-inventory.o bee_getopt.o
 
 bee_MANPAGES=$(addprefix manpages/,${MANPAGES})
 bee_BUILDTYPES=$(addsuffix .sh,$(addprefix buildtypes/,$(BUILDTYPES)))
 
 shellscripts: $(addsuffix .sh,$(SHELLSCRIPTS)) $(LIBRARY_SHELL)
-cprograms:    $(PROGRAMS_C) ${HELPER_BEE_C}
+cprograms:    $(PROGRAMS_C) ${HELPER_BEE_C} ${HELPER_C}
 manpages:     ${bee_MANPAGES}
 buildtypes:   ${bee_BUILDTYPES}
 
@@ -169,15 +170,15 @@ beeuniq: $(addprefix src/, ${BEEUNIQ_OBJECTS})
 beesort: $(addprefix src/, ${BEESORT_OBJECTS})
 	$(call quiet-command,${CC} ${LDFLAGS} -o $@ $^,"LD	$@")
 
-bee-dep: $(addprefix src/, ${BEEDEP_OBJECTS})
-	$(call quiet-command,${CC} ${LDFLAGS} -o $@ $^,"LD	$@")
-
 beegetopt: $(addprefix src/, ${BEEGETOPT_OBJECTS})
 	$(call quiet-command,${CC} ${LDFLAGS} -o $@ $^,"LD	$@")
 
 beeflock: $(addprefix src/, ${BEEFLOCK_OBJECTS})
 	$(call quiet-command,${CC} ${LDFLAGS} -o $@ $^,"LD	$@")
 
+bee-cache-inventory: $(addprefix src/, ${BEECACHEINVENTORY_OBJECTS})
+	$(call quiet-command,${CC} ${LDFLAGS} -lcrypt -o $@ $^,"LD	$@")
+
 %.o: %.c
 	$(call quiet-command,${CC} ${CFLAGS} -o $@ -c $^,"CC	$@")
 
@@ -194,6 +195,7 @@ clean:
 	$(call quiet-command,rm -f $(addsuffix .sh,${SHELLSCRIPTS}) $(LIBRARY_SHELL) $(HELPER_SHELL),"CLEAN	<various>.sh")
 	$(call quiet-command,rm -f ${PROGRAMS_C},"CLEAN	${PROGRAMS_C}")
 	$(call quiet-command,rm -f ${HELPER_BEE_C},"CLEAN	${HELPER_BEE_C}")
+	$(call quiet-command,rm -f ${HELPER_C},"CLEAN	${HELPER_C}")
 	$(call quiet-command,rm -f src/*.o,"CLEAN	c object files")
 	$(call quiet-command,rm -f ${bee_MANPAGES},"CLEAN	manpages")
 	$(call quiet-command,rm -f ${bee_BUILDTYPES},"CLEAN	buildtypes")
@@ -224,14 +226,17 @@ ${DESTDIR}${LIBEXECDIR}/bee/bee.d/%: %.sh install-dir-tools
 ${DESTDIR}${LIBEXECDIR}/bee/bee.d/%: % install-dir-tools
 	$(call quiet-install,0755,$<,$@)
 
-install-helper: $(addprefix ${DESTDIR}${LIBEXECDIR}/bee/,${HELPER_SHELL})
+install-helper: $(addprefix ${DESTDIR}${LIBEXECDIR}/bee/,${HELPER_SHELL} ${HELPER_C})
 
 install-dir-helper:
 	$(call quiet-installdir,0755,${DESTDIR}${LIBEXECDIR}/bee)
 
 ${DESTDIR}${LIBEXECDIR}/bee/%: %.sh install-dir-helper
 	$(call quiet-install,0755,$<,$@)
 
+${DESTDIR}${LIBEXECDIR}/bee/%: % install-dir-helper
+	$(call quiet-install,0755,$<,$@)
+
 install-beeshlib: $(addprefix ${DESTDIR}${LIBEXECDIR}/bee/,${LIBRARY_SHELL})
 
 install-dir-beeshlib: