dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-systemtap-0.5.14.tar.gz

.gitignore

@@ -0,0 +1 @@
+systemtap-0.8.tar.gz

Makefile

@@ -1,93 +0,0 @@
-# Makefile for source rpm: systemtap
-# $Id: Makefile,v 1.2 2006/07/19 22:31:35 roland Exp $
-NAME := systemtap
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
-
-tarball = systemtap-$(VERSION).tar.gz
-
-ifeq ($(clobber),t)
-commit-check = :
-else
-commit-check = cvs -Q diff --brief > /dev/null 2>&1
-endif
-
-elfutils-version := $(shell awk '$$2 == "elfutils_version" { print $$3 }' \
-				systemtap.spec)
-eu-dir = ../../elfutils/devel
-$(eu-dir)/elfutils.spec: FORCE
-	cd $(@D) && cvs -Q update && $(commit-check)
-$(eu-dir)/%.tar.gz: $(eu-dir)/elfutils.spec
-	$(MAKE) -C $(@D) sources
-$(eu-dir)/%.patch: $(eu-dir)/elfutils.spec ;
-
-import-systemtap: $(tarball)
-	$(commit-check) systemtap.spec
-	tar -zf $(tarball) -xO '*.spec' > systemtap.spec
-	$(MAKE) upload-systemtap
-	touch $@
-
-upload-systemtap: $(tarball) \
-		  $(addprefix $(eu-dir)/,\
-					 elfutils-$(elfutils-version).tar.gz \
-					 elfutils-portability.patch)
-	ln -f $(filter $(eu-dir)/%.tar.gz,$^) .
-	ln -f $(filter $(eu-dir)/%.patch,$^) .
-	$(MAKE) new-source FILES='$(filter-out %.patch,$^)'
-
-copy-sources-%: import-systemtap
-	cd ../$* && $(commit-check)
-	cp -f sources elfutils-portability.patch ../$*
-	ln -f elfutils-*.tar.gz $(tarball) ../$*
-
-propagate-%: copy-sources-%
-	cp -f systemtap.spec ../$*
-	touch $@
-
-# No automagic macros in beehive, only brew.
-propagate-RHEL-4: copy-sources-RHEL-4 ../RHEL-4/systemtap.spec
-	touch $@
-propagate-FC-4: copy-sources-FC-4 ../FC-4/systemtap.spec
-	touch $@
-
-../RHEL-4/systemtap.spec: systemtap.spec import-systemtap
-	@rm -f $@.new
-	(echo '%define dist .el4'; \
-	 echo '%define rhel 4'; \
-	 cat systemtap.spec) > $@.new
-	mv -f $@.new $@
-../FC-4/systemtap.spec: systemtap.spec import-systemtap
-	@rm -f $@.new
-	(echo '%define dist .fc4'; \
-	 echo '%define fedora 4'; \
-	 cat systemtap.spec) > $@.new
-	mv -f $@.new $@
-
-.PRECIOUS: propagate-% tag-%
-
-commit-%: propagate-%
-	cd ../$* && cvs commit -m'Automatic update to $(VERSION)'
-	touch $@
-
-tag-%: commit-%
-	cd ../$* && $(MAKE) tag
-	touch $@
-
-build-%: tag-%
-	cd ../$* && $(MAKE) build

elfutils-configury.patch

@@ -1,106 +0,0 @@
-Index: Makefile.am
-===================================================================
-RCS file: /cvs/systemtap/src/Makefile.am,v
-retrieving revision 1.80
-retrieving revision 1.81
-diff -u -r1.80 -r1.81
---- Makefile.am	2 Jul 2007 19:40:50 -0000	1.80
-+++ Makefile.am	3 Jul 2007 19:49:36 -0000	1.81
-@@ -44,16 +44,16 @@
- 
- .PHONY: install-elfutils
- install-elfutils:
--	mkdir -p $(pkglibdir)
-+	mkdir -p $(DESTDIR)$(pkglibdir)
- 	for file in lib-elfutils/*.so* lib-elfutils/${PACKAGE_NAME}/*.so*; do \
--	   $(INSTALL_PROGRAM) $$file $(pkglibdir); \
-+	   $(INSTALL_PROGRAM) $$file $(DESTDIR)$(pkglibdir); \
- 	done
- install-exec-local: install-elfutils
- endif
- 
- staprun_SOURCES = runtime/staprun/staprun.c runtime/staprun/mainloop.c \
- 	runtime/staprun/symbols.c runtime/staprun/ctl.c \
--	runtime/staprun/relay.c runtime/staprun/relay_old.c 
-+	runtime/staprun/relay.c runtime/staprun/relay_old.c
- 
- staprun_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS)
- staprun_LDADD = @PROCFLAGS@ -lpthread
-@@ -78,7 +78,7 @@
- 	$(CC) -shared -rdynamic $(LDFLAGS) $(CFLAGS) -fPIC -o $@ $<
- all-local: $(STAPLOG)
- install-exec-local: $(STAPLOG)
--	$(INSTALL) $(STAPLOG) $(pkglibdir)
-+	$(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir)
- else
- endif
- 
-@@ -153,10 +153,9 @@
-   SUBDIRS += runtime/lket/b2a
- endif
- 
--SRCDIR = $(shell cd $(srcdir); pwd)
--
- check:
--	$(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$(SRCDIR)/runtime SYSTEMTAP_TAPSET=$(SRCDIR)/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH=$(PWD) RUNTESTFLAGS="$(RUNTESTFLAGS)"
-+	SRCDIR=`cd $(srcdir); pwd`; \
-+	$(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$$SRCDIR/runtime SYSTEMTAP_TAPSET=$$SRCDIR/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH=$(PWD) RUNTESTFLAGS="$(RUNTESTFLAGS)"
- 
- installcheck:
- 	$(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)"
-Index: Makefile.in
-===================================================================
-RCS file: /cvs/systemtap/src/Makefile.in,v
-retrieving revision 1.89
-retrieving revision 1.90
-diff -u -r1.89 -r1.90
---- Makefile.in	2 Jul 2007 19:40:50 -0000	1.89
-+++ Makefile.in	3 Jul 2007 19:49:36 -0000	1.90
-@@ -283,7 +282,7 @@
- @BUILD_ELFUTILS_TRUE@stap_DEPENDENCIES = lib-elfutils/libdw.so
- staprun_SOURCES = runtime/staprun/staprun.c runtime/staprun/mainloop.c \
- 	runtime/staprun/symbols.c runtime/staprun/ctl.c \
--	runtime/staprun/relay.c runtime/staprun/relay_old.c 
-+	runtime/staprun/relay.c runtime/staprun/relay_old.c
- 
- staprun_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS)
- staprun_LDADD = @PROCFLAGS@ -lpthread
-@@ -317,7 +316,6 @@
- TEST_COV_DIR = coverage
- # XXX: leaves behind man pages
- SUBDIRS = testsuite $(am__append_4)
--SRCDIR = $(shell cd $(srcdir); pwd)
- all: $(BUILT_SOURCES) config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-@@ -1385,9 +1383,9 @@
- 
- @BUILD_ELFUTILS_TRUE@.PHONY: install-elfutils
- @BUILD_ELFUTILS_TRUE@install-elfutils:
--@BUILD_ELFUTILS_TRUE@	mkdir -p $(pkglibdir)
-+@BUILD_ELFUTILS_TRUE@	mkdir -p $(DESTDIR)$(pkglibdir)
- @BUILD_ELFUTILS_TRUE@	for file in lib-elfutils/*.so* lib-elfutils/${PACKAGE_NAME}/*.so*; do \
--@BUILD_ELFUTILS_TRUE@	   $(INSTALL_PROGRAM) $$file $(pkglibdir); \
-+@BUILD_ELFUTILS_TRUE@	   $(INSTALL_PROGRAM) $$file $(DESTDIR)$(pkglibdir); \
- @BUILD_ELFUTILS_TRUE@	done
- @BUILD_ELFUTILS_TRUE@install-exec-local: install-elfutils
- 
-@@ -1395,7 +1393,7 @@
- @BUILD_CRASHMOD_TRUE@	$(CC) -shared -rdynamic $(LDFLAGS) $(CFLAGS) -fPIC -o $@ $<
- @BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG)
- @BUILD_CRASHMOD_TRUE@install-exec-local: $(STAPLOG)
--@BUILD_CRASHMOD_TRUE@	$(INSTALL) $(STAPLOG) $(pkglibdir)
-+@BUILD_CRASHMOD_TRUE@	$(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir)
- 
- # Copy some of the testsuite sample scripts to the distdir
- # 'examples/samples' directory.
-@@ -1443,7 +1441,8 @@
- 	-rm -rf $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)
- 
- check:
--	$(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$(SRCDIR)/runtime SYSTEMTAP_TAPSET=$(SRCDIR)/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH=$(PWD) RUNTESTFLAGS="$(RUNTESTFLAGS)"
-+	SRCDIR=`cd $(srcdir); pwd`; \
-+	$(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$$SRCDIR/runtime SYSTEMTAP_TAPSET=$$SRCDIR/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH=$(PWD) RUNTESTFLAGS="$(RUNTESTFLAGS)"
- 
- installcheck:
- 	$(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)"

sources

@@ -1 +1 @@
-18b705a7364d174f86f09ecb465f547d  systemtap-0.5.14.tar.gz
+e8806e03090f6bff4501df2e5e239717  systemtap-0.8.tar.gz

systemtap.spec

@@ -1,63 +1,50 @@
-# Release number for rpm build.  Stays at 1 for new PACKAGE_VERSION increases.
-%define release 1
-# Version number of oldest elfutils release that works with systemtap.
-%define elfutils_version 0.128
-
-# Set bundled_elfutils to 0 on systems that have %{elfutils_version} or newer.
-%if 0%{?fedora}
-%define bundled_elfutils 1
-%if "%fedora" >= "6"
-%define bundled_elfutils 0
-%endif
-%endif
-
-%if 0%{?rhel}
-%define bundled_elfutils 1
-%if "%rhel" >= "6"
-%define bundled_elfutils 0
-%endif
-%endif
-
-%if 0%{!?bundled_elfutils:1}
-# Yo!  DO NOT TOUCH THE FOLLOWING LINE.
-# You can use rpmbuild --define "bundled_elfutils 0" for a build of your own.
-%define bundled_elfutils 1
-%endif
+%{!?release: %define release 1}
+%{!?with_sqllite: %define with_sqlite 1}
+%{!?with_docs: %define with_docs 1}
+%{!?with_crash: %define with_crash 0}
+%{!?with_bundled_elfutils: %define with_bundled_elfutils 0}
+%{!?elfutils_version: %define elfutils_version 0.127}
 
 Name: systemtap
-Version: 0.5.14
+# for version, see also configure.ac
+Version: 0.8
 Release: %{release}%{?dist}
 Summary: Instrumentation System
 Group: Development/System
-License: GPL
+License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: ftp://sourceware.org/pub/%{name}/%{name}-%{version}.tar.gz
+Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: kernel >= 2.6.9-11
-BuildRequires: glib2-devel >= 2.0.0
-# make check
-BuildRequires: dejagnu
+%if %{with_sqlite}
 BuildRequires: sqlite-devel
-Requires: glib2 >= 2.0.0
+Requires: sqlite
+%endif
+%if %{with_crash}
+BuildRequires: crash-devel zlib-devel
+%endif
 # Requires: kernel-devel
 # or is that kernel-smp-devel?  kernel-hugemem-devel?
 Requires: gcc make
 # Suggest: kernel-debuginfo
 Requires: systemtap-runtime = %{version}-%{release}
-Requires: sudo
-Requires: sqlite
 
-%if %{bundled_elfutils}
+%if %{with_bundled_elfutils}
 Source1: elfutils-%{elfutils_version}.tar.gz
 Patch1: elfutils-portability.patch
 %define setup_elfutils -a1
 %else
 BuildRequires: elfutils-devel >= %{elfutils_version}
 %endif
+%if %{with_crash}
+Requires: crash
+%endif
 
-Patch2: elfutils-configury.patch
+%if %{with_docs}
+BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
+%endif
 
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
@@ -67,37 +54,69 @@ of the system.
 %package runtime
 Summary: Instrumentation System Runtime
 Group: Development/System
-License: GPL
+License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: kernel >= 2.6.9-11
+Requires(pre): shadow-utils
 
 %description runtime
 SystemTap runtime is the runtime component of an instrumentation
 system for systems running Linux 2.6.  Developers can write
 instrumentation to collect data on the operation of the system.
 
+%package testsuite
+Summary: Instrumentation System Testsuite
+Group: Development/System
+License: GPLv2+
+URL: http://sourceware.org/systemtap/
+Requires: systemtap dejagnu
+
+%description testsuite
+The testsuite allows testing of the entire SystemTap toolchain
+without having to rebuild from sources.
+
+%package client
+Summary: Instrumentation System Client
+Group: Development/System
+License: GPLv2+
+URL: http://sourceware.org/systemtap/
+Requires: systemtap-runtime = %{version}-%{release}
+Requires: avahi avahi-tools nc mktemp
+
+%description client
+SystemTap client is the client component of an instrumentation
+system for systems running Linux 2.6.  Developers can write
+instrumentation to collect data on the operation of the system.
+
+%package server
+Summary: Instrumentation System Server
+Group: Development/System
+License: GPLv2+
+URL: http://sourceware.org/systemtap/
+Requires: systemtap
+Requires: avahi avahi-tools nc net-tools mktemp
+
+%description server
+SystemTap server is the server component of an instrumentation
+system for systems running Linux 2.6.  Developers can write
+instrumentation to collect data on the operation of the system.
+
 %prep
 %setup -q %{?setup_elfutils}
 
-%if %{bundled_elfutils}
+%if %{with_bundled_elfutils}
 cd elfutils-%{elfutils_version}
 %patch1 -p1
 sleep 1
 find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch
 sleep 1
 find . \( -name configure -o -name config.h.in \) -print | xargs touch
-
-# XXX trivial patch for 0.128
-sed -i /ifndef/s/PACKAGE/PACKAGE_NAME/ libdwfl/libdwflP.h
-
 cd ..
 %endif
 
-%patch2 -p0
-
 %build
 
-%if %{bundled_elfutils}
+%if %{with_bundled_elfutils}
 # Build our own copy of elfutils.
 %define elfutils_config --with-elfutils=elfutils-%{elfutils_version}
 
@@ -112,53 +131,149 @@ cd ..
 %define elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils
 %endif
 
-%configure %{?elfutils_config}
+# Enable/disable the sqlite coverage testing support
+%if %{with_sqlite}
+%define sqlite_config --enable-sqlite
+%else
+%define sqlite_config --disable-sqlite
+%endif
+
+# Enable/disable the crash extension
+%if %{with_crash}
+%define crash_config --enable-crash
+%else
+%define crash_config --disable-crash
+%endif
+
+%if %{with_docs}
+%define docs_config --enable-docs
+%else
+%define docs_config --disable-docs
+%endif
+
+
+
+%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config}
 make %{?_smp_mflags}
 
-# Fix paths in the example scripts
-find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
-
-# To avoid perl dependency, make perl sample script non-executable
-chmod -x examples/samples/kmalloc-top
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=$RPM_BUILD_ROOT install
 
-%check
-make check %{?elfutils_mflags} || :
+# We want the examples in the special doc dir, not the build install dir.
+# We build it in place and then move it away so it doesn't get installed
+# twice. rpm can specify itself where the (versioned) docs go with the
+# %doc directive.
+mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples
+
+# Fix paths in the example & testsuite scripts
+find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
+
+# Because "make install" may install staprun with mode 04111, the
+# post-processing programs rpmbuild runs won't be able to read it.
+# So, we change permissions so that they can read it.  We'll set the
+# permissions back to 04111 in the %files section below.
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/staprun
+
+# Copy over the testsuite
+cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap
+
+%if %{with_docs}
+# We want the manuals in the special doc dir, not the generic doc install dir.
+# We build it in place and then move it away so it doesn't get installed
+# twice. rpm can specify itself where the (versioned) docs go with the
+# %doc directive.
+mkdir docs.installed
+mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/
+%endif
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%pre runtime
+getent group stapdev >/dev/null || groupadd -r stapdev
+getent group stapusr >/dev/null || groupadd -r stapusr
+exit 0
+
 %files
 %defattr(-,root,root)
 
 %doc README AUTHORS NEWS COPYING examples
+%if %{with_docs}
+%doc docs.installed/*.pdf
+%endif
 
 %{_bindir}/stap
-%{_bindir}/lket-b2a
+%{_bindir}/stap-report
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
-%dir %{_datadir}/systemtap
-%{_datadir}/systemtap/runtime
-%{_datadir}/systemtap/tapset
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/runtime
+%{_datadir}/%{name}/tapset
 
-%if %{bundled_elfutils}
+%if %{with_bundled_elfutils} || %{with_crash}
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.so*
+%endif
+%if %{with_bundled_elfutils}
+%{_libdir}/%{name}/lib*.so*
+%endif
+%if %{with_crash}
+%{_libdir}/%{name}/staplog.so*
 %endif
 
 %files runtime
 %defattr(-,root,root)
-%{_bindir}/staprun
-%{_libexecdir}/systemtap
-%{_mandir}/man8/*
+%attr(4111,root,root) %{_bindir}/staprun
+%{_bindir}/stap-report
+%{_libexecdir}/%{name}
+%{_mandir}/man8/staprun.8*
 
 %doc README AUTHORS NEWS COPYING
 
+%files testsuite
+%defattr(-,root,root)
+%{_datadir}/%{name}/testsuite
+
+%files client
+%defattr(-,root,root)
+%{_bindir}/stap-client
+%{_bindir}/stap-find-servers
+%{_bindir}/stap-find-or-start-server
+%{_mandir}/man8/stap-server.8*
+
+%files server
+%defattr(-,root,root)
+%{_bindir}/stap-server
+%{_bindir}/stap-serverd
+%{_bindir}/stap-start-server
+%{_bindir}/stap-stop-server
+%{_mandir}/man8/stap-server.8*
+
 %changelog
+* Thu Nov 13 2008 Frank Ch. Eigler <fche@redhat.com> - 0.8-1
+- Upstream release.
+
+* Tue Jul 15 2008 Frank Ch. Eigler <fche@redhat.com> - 0.7-1
+- Upstream release.
+
+* Fri Feb  1 2008 Frank Ch. Eigler <fche@redhat.com> - 0.6.1-3
+- Add zlib-devel to buildreq; missing from crash-devel
+- Process testsuite .stp files for #!stap->#!/usr/bin/stap
+
+* Fri Jan 18 2008 Frank Ch. Eigler <fche@redhat.com> - 0.6.1-1
+- Add crash-devel buildreq to build staplog.so crash(8) module.
+- Many robustness & functionality improvements:
+
+* Wed Dec  5 2007 Will Cohen <wcohen@redhat.com> - 0.6-2
+- Correct Source to point to location contain code.
+
+* Thu Aug  9 2007 David Smith <dsmith@redhat.com> - 0.6-1
+- Bumped version, added libcap-devel BuildRequires.
+
+* Wed Jul 11 2007 Will Cohen <wcohen@redhat.com> - 0.5.14-2
+- Fix Requires and BuildRequires for sqlite.
+
 * Tue Jul  2 2007 Frank Ch. Eigler <fche@redhat.com> - 0.5.14-1
 - Many robustness improvements: 1117, 1134, 1305, 1307, 1570, 1806,
   2033, 2116, 2224, 2339, 2341, 2406, 2426, 2438, 2583, 3037,