From 3acaec35c6a58c27e22578d8b6f83ad71c7801c0 Mon Sep 17 00:00:00 2001 From: Tobias Dreyer Date: Mon, 23 Jul 2012 10:26:54 +0200 Subject: [PATCH 1/7] filelist2content: remove trailing whitespaces --- src/filelist2content.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filelist2content.sh.in b/src/filelist2content.sh.in index 22b2d6e..9f8356f 100644 --- a/src/filelist2content.sh.in +++ b/src/filelist2content.sh.in @@ -113,7 +113,7 @@ function do_f2c() { exit 1 fi - echo -n ":md5=${md5%% *}" + echo -n ":md5=${md5%% *}" elif [ "${type}" = "symlink" ] ; then file="${file}//$(readlink ${root}${file})" elif [ "${type}" = "block" -o "${type}" = "char" ] ; then From 39edfc38699a9e56662f7efae71aa11ce7dc7aca Mon Sep 17 00:00:00 2001 From: Tobias Dreyer Date: Mon, 23 Jul 2012 10:46:34 +0200 Subject: [PATCH 2/7] filelist2content: strip $root from symlink targets this fixes issue #128 --- src/filelist2content.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/filelist2content.sh.in b/src/filelist2content.sh.in index 9f8356f..9600b1d 100644 --- a/src/filelist2content.sh.in +++ b/src/filelist2content.sh.in @@ -115,7 +115,8 @@ function do_f2c() { echo -n ":md5=${md5%% *}" elif [ "${type}" = "symlink" ] ; then - file="${file}//$(readlink ${root}${file})" + target=$(readlink ${root}${file}) + file="${file}//${target#${root}}" elif [ "${type}" = "block" -o "${type}" = "char" ] ; then echo -n ":major=${major}" echo -n ":minor=${minor}" From 5cc97b7bd9e805adec46199ec8218c48f87359ca Mon Sep 17 00:00:00 2001 From: Tobias Dreyer Date: Thu, 7 Jun 2012 16:06:07 +0200 Subject: [PATCH 3/7] hooks: info-dir: fix missing value for BEE_METAFORMAT in old bee packages --- hooks/info-dir.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/info-dir.sh b/hooks/info-dir.sh index 8c3d535..6d26038 100644 --- a/hooks/info-dir.sh +++ b/hooks/info-dir.sh @@ -44,7 +44,7 @@ fi . ${BEE_METADIR}/${pkg}/META -if [ ! "${BEEMETAFORMAT}" -ge 2 ] ; then +if [ ! "${BEEMETAFORMAT:=0}" -ge 2 ] ; then exit 0 fi @@ -63,4 +63,4 @@ case "${action}" in ${INSTALLINFO} --delete ${i} ${DIRFILE} >/dev/null done ;; -esac \ No newline at end of file +esac From a8e96e45398cd5e1deb43de6de80677a51f41d10 Mon Sep 17 00:00:00 2001 From: Tobias Dreyer Date: Thu, 2 Aug 2012 09:36:40 +0200 Subject: [PATCH 4/7] Makefile: install info-dir hook --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a00d031..21baeaf 100644 --- a/Makefile +++ b/Makefile @@ -103,6 +103,7 @@ HELPER_HOOKS_SHELL+=gdk-pixbuf-query-loaders HELPER_HOOKS_SHELL+=mandb HELPER_HOOKS_SHELL+=systemd-tmpfiles HELPER_HOOKS_SHELL+=gconf-install-schemas +HELPER_HOOKS_SHELL+=info-dir MANPAGES+=bee.1 MANPAGES+=bee-check.1 From 138564e30340d5b48bc333028524b190f4711655 Mon Sep 17 00:00:00 2001 From: Matthias Ruester Date: Thu, 2 Aug 2012 09:06:59 +0200 Subject: [PATCH 5/7] Makefile: remove target 'compat' --- Makefile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Makefile b/Makefile index a00d031..25f3239 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,6 @@ sed-rules = -e 's,@PREFIX@,${PREFIX},g' \ -e 's,@BEE_VERSION@,${BEE_VERSION},g' \ -e 's,@DATADIR@,${DATADIR},g' -sed-compat-bashlt4 = -e 'sx\$${\([a-zA-Z_]*\),,}x\$$(tr A-Z a-z <<<\$${\1})xg' \ - -e 'sx\$${\([a-zA-Z_]*\)^^}x\$$(tr a-z A-Z <<<\$${\1})xg' - PROGRAMS_C+=beecut PROGRAMS_C+=beeflock PROGRAMS_C+=beegetopt @@ -119,23 +116,12 @@ CONFIG_TEMPLATES+=fallback CONFIG_FILES+=skiplist CONFIG_FILES+=beerc -COMPAT_BASHLT4+=beesh.sh -COMPAT_BASHLT4+=bee-check.sh -COMPAT_BASHLT4+=buildtypes/autogen.sh -COMPAT_BASHLT4+=buildtypes/configure.sh -COMPAT_BASHLT4+=buildtypes/make.sh - .SUFFIXES: .in .sh .sh.in all: build build: shellscripts buildtypes cprograms manpages -compat: compat-bashlt4 - -compat-bashlt4: ${COMPAT_BASHLT4} - $(call quiet-command, sed ${sed-compat-bashlt4} -i ${COMPAT_BASHLT4}, "COMPAT $^" ) - SHELLSCRIPTS=$(PROGRAMS_SHELL) $(HELPER_BEE_SHELL) $(HELPER_SHELL) BEEVERSION_OBJECTS=beeversion.o bee_version_parse.o bee_version_compare.o bee_version_output.o From 975478f2e57a16a84381582bbbd63f75b783f89e Mon Sep 17 00:00:00 2001 From: Matthias Ruester Date: Thu, 2 Aug 2012 09:57:59 +0200 Subject: [PATCH 6/7] Makefile: remove compile option -lcrypt from bee-cache-inventory --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 25f3239..b866937 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ 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 $@") + $(call quiet-command,${CC} ${LDFLAGS} -o $@ $^,"LD $@") %.o: %.c $(call quiet-command,${CC} ${CFLAGS} -o $@ -c $^,"CC $@") From a132b52c490939ff169ab5f10377495baf2128c1 Mon Sep 17 00:00:00 2001 From: Matthias Ruester Date: Thu, 2 Aug 2012 10:00:46 +0200 Subject: [PATCH 7/7] Makefile: remove HELPER_BEE_C variable references make variable HELPER_BEE_C is not set anymore --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b866937..01b178a 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ bee_MANPAGES=$(addprefix manpages/,${MANPAGES}) bee_BUILDTYPES=$(addsuffix .sh,$(addprefix buildtypes/,$(BUILDTYPES))) shellscripts: $(addsuffix .sh,$(SHELLSCRIPTS)) $(LIBRARY_SHELL) -cprograms: $(PROGRAMS_C) ${HELPER_BEE_C} ${HELPER_C} +cprograms: $(PROGRAMS_C) ${HELPER_C} manpages: ${bee_MANPAGES} buildtypes: ${bee_BUILDTYPES} @@ -180,7 +180,6 @@ bee-cache-inventory: $(addprefix src/, ${BEECACHEINVENTORY_OBJECTS}) clean: $(call quiet-command,rm -f $(addsuffix .sh,${SHELLSCRIPTS}) $(LIBRARY_SHELL) $(HELPER_SHELL),"CLEAN .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") @@ -201,7 +200,7 @@ ${DESTDIR}${BINDIR}/%: % install-dir-bindir ${DESTDIR}${BINDIR}/%: %.sh install-dir-bindir $(call quiet-install,0755,$<,$@) -install-tools: $(addprefix ${DESTDIR}${LIBEXECDIR}/bee/bee.d/,${HELPER_BEE_SHELL} ${HELPER_BEE_C}) +install-tools: $(addprefix ${DESTDIR}${LIBEXECDIR}/bee/bee.d/,${HELPER_BEE_SHELL}) install-dir-tools: $(call quiet-installdir,0755,${DESTDIR}${LIBEXECDIR}/bee/bee.d)