strickra@ops-em1ops-repomaster:/export/incoming/trusty$ cat ~/src/log*patch *** debian/control 2016-02-05 00:07:30.338987106 +0000 --- debian/control 2016-02-05 00:34:52.714931962 +0000 *************** *** 71,73 **** --- 71,100 ---- . This package contains the distributable documentation, all the examples and the main changelog. + + Package: logbash + Architecture: any + Multi-Arch: foreign + Pre-Depends: dash (>= 0.5.5.1-2.2), ${shlibs:Pre-Depends}, ${misc:Depends} + Depends: base-files (>= 2.1.12), debianutils (>= 2.15) + Recommends: bash-completion (>= 20060301-0) + Conflicts: bash-completion (<< 20060301-0) + Replaces: bash-doc (<= 2.05-1), bash-completion (<< 20060301-0) + Suggests: bash-doc + Essential: yes + Section: shells + Priority: optional + Description: GNU Bourne Again SHell + Bash is an sh-compatible command language interpreter that executes + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). + . + Bash is ultimately intended to be a conformant implementation of the + IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). + . + The Programmable Completion Code, by Ian Macdonald, is now found in + the bash-completion package. + . + This version has been modified to log all command line activity to + the user.info facility of syslog. + *** debian/rules 2016-02-05 00:07:58.830971829 +0000 --- debian/rules 2016-02-05 05:36:38.406484783 +0000 *************** *** 59,69 **** --- 58,70 ---- p_stat = bash-static p_bins = bash-builtins p_doc = bash-doc + p_log = logbash d = debian/$(p) d_stat = debian/$(p_stat) d_bins = debian/$(p_bins) d_doc = debian/$(p_doc) + d_log = debian/$(p_log) termcap_lib := $(if $(wildcard /usr/lib/libtinfo.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtinfo.so), \ -ltinfo, \ *************** *** 89,95 **** --without-bash-malloc \ #build: bash-build static-build preinst-build check ! build: before-build bash-build static-build preinst-build check build-arch: build build-indep: build --- 90,96 ---- --without-bash-malloc \ #build: bash-build static-build preinst-build check ! build: before-build bash-build logbash-build static-build preinst-build check build-arch: build build-indep: build *************** *** 118,123 **** --- 119,138 ---- configure_args="$(conf_args)" # --------------------------------------------------------------------------- + # build logbash + + logbash-build: + $(MAKE) -f debian/rules do-build-logbash \ + bash_src=. \ + build=logbash \ + configure_args="$(conf_args)" + logbash-configure: + $(MAKE) -f debian/rules do-configure-logbash \ + bash_src=. \ + build=logbash \ + configure_args="$(conf_args)" + + # --------------------------------------------------------------------------- # build static bash static-build: *************** *** 143,149 **** # --------------------------------------------------------------------------- check: stamps/stamp-check ! stamps/stamp-check: bash-build @echo BEGIN test ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) --- 158,164 ---- # --------------------------------------------------------------------------- check: stamps/stamp-check ! stamps/stamp-check: bash-build logbash-build @echo BEGIN test ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) *************** *** 184,196 **** # --------------------------------------------------------------------------- ! install: bash-install ! bash-install: bash-build stamps/stamp-install-bash ! stamps/stamp-install-bash: before-build stamps/stamp-build-bash dh_testdir dh_testroot ! dh_clean -k -p$(p) -p$(p_doc) -p$(p_bins) dh_installdirs -p$(p) \ bin \ etc/skel \ --- 199,211 ---- # --------------------------------------------------------------------------- ! install: bash-install ! bash-install: bash-build logbash-build stamps/stamp-install-bash ! stamps/stamp-install-bash: before-build stamps/stamp-build-bash stamps/stamp-build-logbash dh_testdir dh_testroot ! dh_clean -k -p$(p) -p$(p_doc) -p$(p_bins) -p$(p_log) dh_installdirs -p$(p) \ bin \ etc/skel \ *************** *** 200,205 **** dh_installdirs -p$(p_bins) \ usr/share/doc/$(p)/examples/loadables \ usr/include/bash/{builtins,lib/{glob,tilde}} ifeq ($(with_gfdl),yes) # XXXXX --- 215,222 ---- dh_installdirs -p$(p_bins) \ usr/share/doc/$(p)/examples/loadables \ usr/include/bash/{builtins,lib/{glob,tilde}} + dh_installdirs -p$(p_log) \ + bin ifeq ($(with_gfdl),yes) # XXXXX *************** *** 211,216 **** --- 227,237 ---- YACC="$(YACC)" \ DESTDIR=$(CURDIR)/$(d) mv $(d)/usr/bin/bash $(d)/bin/. + $(MAKE) -C build-logbash install \ + YACC="$(YACC)" \ + DESTDIR=$(CURDIR)/$(d_log) + mv $(d_log)/usr/bin/bash $(d_log)/bin/logbash + rm -r $(d_log)/usr chmod 755 $(d)/usr/bin/bashbug $(ID) debian/bashbug.1 $(d)/usr/share/man/man1/ ifneq ($(with_gfdl),yes) *************** *** 320,325 **** --- 341,360 ---- dh_md5sums -p$(p) dh_builddeb -p$(p) + binary-logbash: logbash-build + dh_testdir + dh_testroot + dh_installchangelogs -p$(p_log) + dh_installmenu -p$(p_log) + dh_strip -p$(p_log) + dh_compress -p$(p_log) + dh_fixperms -p$(p_log) + dh_shlibdeps -p$(p_log) -- -dPre-Depends $(d_log)/bin/logbash + dh_installdeb -p$(p_log) + dh_gencontrol -p$(p_log) + dh_md5sums -p$(p_log) + dh_builddeb -p$(p_log) + # Even though it contains only headers and example files, # bash-builtins is NOT arch-independent because the config.h* files # differ on different archs. *************** *** 355,361 **** dh_builddeb -p$(p_stat) binary-indep: binary-doc ! binary-arch: binary-bash binary-builtins binary-static binary: binary-indep binary-arch # --------------------------------------------------------------------------- --- 390,396 ---- dh_builddeb -p$(p_stat) binary-indep: binary-doc ! binary-arch: binary-bash binary-logbash binary-builtins binary-static binary: binary-indep binary-arch # --------------------------------------------------------------------------- *************** *** 402,412 **** --- 437,455 ---- dh_testdir rm -rf build-$(build) mkdir build-$(build) + ifeq ($(build),logbash) + cd build-$(build) && \ + CC="$(CC)" \ + CFLAGS="$(CFLAGS) -DSYSLOG_HISTORY" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ + YACC="$(YACC)" \ + ../$(bash_src)/configure $(configure_args) + else cd build-$(build) && \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ YACC="$(YACC)" \ ../$(bash_src)/configure $(configure_args) + endif if ! grep -q '#define HAVE_DEV_STDIN 1' build-$(build)/config.h; then \ echo "HAVE_DEV_STDIN not defined, abortig build"; \ exit 1; \ *************** *** 439,448 **** .NOTPARALLEL: build .PHONY: unpack binary binary-arch binary-indep clean \ ! build bash-build static-build preinst-build \ check \ ! bash-configure static-configure \ ! binary-doc binary-bash binary-builtins binary-static \ install bash-install # Local Variables: --- 482,491 ---- .NOTPARALLEL: build .PHONY: unpack binary binary-arch binary-indep clean \ ! build bash-build logbash-build static-build preinst-build \ check \ ! bash-configure logbash-configure static-configure \ ! binary-doc binary-bash binary-logbash binary-builtins binary-static \ install bash-install # Local Variables: