This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 662414a4b71ee69788aebba88901a7ff0b24293e (commit) via dfd822c249a91d3247600c6e425e9f8553a0c44b (commit) via b1656fcbcc2608c6521a762a48960801f76b373f (commit) via 89a99aaf4f4867b503b5a36f54307948ec96c858 (commit) from 344cba00b1d0fd9d5a9a20e83efda65e05c006e9 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 662414a4b71ee69788aebba88901a7ff0b24293e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 12 12:14:13 2012 +0100

kernel: Create man pages for tools.

As asciidoc is now available, we are able to build the man pages for the tools.

commit dfd822c249a91d3247600c6e425e9f8553a0c44b Merge: 89a99aa b1656fc Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 12 12:03:07 2012 +0100

Merge remote-tracking branch 'stevee/asciidoc'

commit b1656fcbcc2608c6521a762a48960801f76b373f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Feb 11 23:01:46 2012 +0100

asciidoc: New package.

This package is required to generate manpages for the kernel-tools.

Fixes #10009

commit 89a99aaf4f4867b503b5a36f54307948ec96c858 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 12 11:17:47 2012 +0100

xorg-x11-drv-mouse: Fix syntax error in maintainer field.

-----------------------------------------------------------------------

Summary of changes: asciidoc/asciidoc.nm | 61 ++++++++++++++ asciidoc/patches/asciidoc-8.4.5-datadir.patch | 86 ++++++++++++++++++++ ...asciidoc-8.4.5-use-unsafe-mode-by-default.patch | 38 +++++++++ kernel/kernel.nm | 7 +- xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm | 5 +- 5 files changed, 191 insertions(+), 6 deletions(-) create mode 100644 asciidoc/asciidoc.nm create mode 100644 asciidoc/patches/asciidoc-8.4.5-datadir.patch create mode 100644 asciidoc/patches/asciidoc-8.4.5-use-unsafe-mode-by-default.patch

Difference in files: diff --git a/asciidoc/asciidoc.nm b/asciidoc/asciidoc.nm new file mode 100644 index 0000000..7cbf2b4 --- /dev/null +++ b/asciidoc/asciidoc.nm @@ -0,0 +1,61 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = asciidoc +version = 8.4.5 +release = 1 +arch = noarch + +groups = Application/System +url = http://www.methods.co.nz/asciidoc/ +license = GPL+ and GPLv2+ +summary = Text based document generation. + +description + AsciiDoc is a text document format for writing short documents, + articles, books and UNIX man pages. AsciiDoc files can be translated + to HTML and DocBook markups using the asciidoc(1) command. +end + +source_dl = http://sourceforge.net/projects/asciidoc/files/%%7Bname%7D/%%7Bversion%7D/ + +build + requires + python + end + + prepare_cmds + # Remove forbidden "env" interpreter from script. + sed -e "s@#!.*@#!/bin/bash@g" -i a2x + end + + install_cmds + # Determite python version. + PYTHON_VERSION=$(python -c "import platform; print '.'.join(platform.python_version_tuple()[:2])") + + # Create file layout. + mkdir -pv %{BUILDROOT}/etc/asciidoc + mkdir -pv %{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages + + # Move config data to /etc and link it to correct place, + # so asciidoc will work. + for dir in dblatex docbook-xsl images javascripts stylesheets ; do + mv %{BUILDROOT}/etc/asciidoc/$dir \ + %{BUILDROOT}/usr/share/asciidoc + ln -svf ../../usr/share/asciidoc/$dir %{BUILDROOT}/etc/asciidoc/ + done + + # Install python API. + install -Dpm 644 asciidocapi.py %{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages/asciidocapi.py + end +end + +packages + package %{name} + requires + docbook-xsl + end + end +end diff --git a/asciidoc/patches/asciidoc-8.4.5-datadir.patch b/asciidoc/patches/asciidoc-8.4.5-datadir.patch new file mode 100644 index 0000000..5e34ee2 --- /dev/null +++ b/asciidoc/patches/asciidoc-8.4.5-datadir.patch @@ -0,0 +1,86 @@ +diff -up asciidoc-8.4.5/asciidoc.py.datadir asciidoc-8.4.5/asciidoc.py +--- asciidoc-8.4.5/asciidoc.py.datadir 2009-05-26 05:12:38.000000000 +0300 ++++ asciidoc-8.4.5/asciidoc.py 2009-09-08 00:25:23.000000000 +0300 +@@ -651,6 +651,8 @@ def filter_lines(filter_cmd, lines, attr + if not found: + found = findfilter(filtername, CONF_DIR, cmd) + if not found: ++ found = findfilter(filtername, DATA_DIR, cmd) ++ if not found: + found = findfilter(filtername, APP_DIR, cmd) + else: + if os.path.isfile(cmd): +@@ -4997,6 +4999,7 @@ APP_DIR = None # This file' + USER_DIR = None # ~/.asciidoc + # Global configuration files directory (set by Makefile build target). + CONF_DIR = '/etc/asciidoc' ++DATA_DIR = '/usr/share/asciidoc' + HELP_FILE = 'help.conf' # Default (English) help file. + + # Globals +diff -up asciidoc-8.4.5/Makefile.in.datadir asciidoc-8.4.5/Makefile.in +--- asciidoc-8.4.5/Makefile.in.datadir 2009-04-24 01:49:43.000000000 +0300 ++++ asciidoc-8.4.5/Makefile.in 2009-09-08 00:28:23.000000000 +0300 +@@ -23,6 +23,7 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + + ASCIIDOCCONF = $(sysconfdir)/asciidoc ++ASCIIDOCDATA = $(datadir)/asciidoc + + prog = asciidoc.py a2x + progdir = $(bindir) +@@ -35,25 +36,26 @@ manpdir = $(mandir)/man1 + conf = $(wildcard *.conf) + confdir = $(ASCIIDOCCONF) + +-filtersdir = $(ASCIIDOCCONF)/filters ++filtersdir = $(ASCIIDOCDATA)/filters ++filtersconfdir = $(ASCIIDOCCONF)/filters + + codefilter = filters/code/code-filter.py + codefilterdir = $(filtersdir)/code + codefilterconf = filters/code/code-filter.conf +-codefilterconfdir = $(filtersdir)/code ++codefilterconfdir = $(filtersconfdir)/code + + graphvizfilter = filters/graphviz/graphviz2png.py + graphvizfilterdir = $(filtersdir)/graphviz + graphvizfilterconf = filters/graphviz/graphviz-filter.conf +-graphvizfilterconfdir = $(filtersdir)/graphviz ++graphvizfilterconfdir = $(filtersconfdir)/graphviz + + musicfilter = filters/music/music2png.py + musicfilterdir = $(filtersdir)/music + musicfilterconf = filters/music/music-filter.conf +-musicfilterconfdir = $(filtersdir)/music ++musicfilterconfdir = $(filtersconfdir)/music + + sourcefilterconf = filters/source/source-highlight-filter.conf +-sourcefilterconfdir = $(filtersdir)/source ++sourcefilterconfdir = $(filtersconfdir)/source + + docbook = $(wildcard docbook-xsl/*.xsl) + docbookdir = $(ASCIIDOCCONF)/docbook-xsl +@@ -126,6 +128,13 @@ fixconfpath: + mv $$f.out $$f; \ + done + ++fixdatapath: ++ @for f in $(prog); do \ ++ echo "Fixing DATA_DIR in $$f"; \ ++ $(SED) "s#^DATA_DIR = '.*'#DATA_DIR = '$(ASCIIDOCDATA)'#; s#^DATA_DIR=.*#DATA_DIR=$(ASCIIDOCDATA)#" $$f > $$f.out; \ ++ mv $$f.out $$f; \ ++ done ++ + install-vim: + @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ + if ! test -d $$d; then continue; fi ; \ +@@ -145,7 +154,7 @@ uninstall-vim: + done + + +-build: fixconfpath ++build: fixconfpath fixdatapath + + install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim + diff --git a/asciidoc/patches/asciidoc-8.4.5-use-unsafe-mode-by-default.patch b/asciidoc/patches/asciidoc-8.4.5-use-unsafe-mode-by-default.patch new file mode 100644 index 0000000..0d93cc6 --- /dev/null +++ b/asciidoc/patches/asciidoc-8.4.5-use-unsafe-mode-by-default.patch @@ -0,0 +1,38 @@ +diff -up asciidoc-8.4.5/asciidoc.py.default-unsafe asciidoc-8.4.5/asciidoc.py +--- asciidoc-8.4.5/asciidoc.py.default-unsafe 2009-05-25 22:12:38.000000000 -0400 ++++ asciidoc-8.4.5/asciidoc.py 2009-07-16 02:27:09.000000000 -0400 +@@ -1138,7 +1138,7 @@ class Document: + self.level = 0 # 0 => front matter. 1,2,3 => sect1,2,3. + self.has_errors = False # Set true if processing errors were flagged. + self.has_warnings = False # Set true if warnings were flagged. +- self.safe = True # Default safe mode. ++ self.safe = False # Default safe mode. + def update_attributes(self): + # Set implicit attributes. + if self.infile and os.path.exists(self.infile): +@@ -5205,8 +5205,8 @@ def execute(cmd,opts,args): + for o,v in opts: + if o in ('--help','-h'): + help_option = True +- if o == '--unsafe': +- document.safe = False ++ if o == '--safe': ++ document.safe = True + if o == '--version': + print('asciidoc %s' % VERSION) + sys.exit(0) +diff -up asciidoc-8.4.5/doc/asciidoc.1.default-unsafe asciidoc-8.4.5/doc/asciidoc.1 +--- asciidoc-8.4.5/doc/asciidoc.1.default-unsafe 2009-05-26 02:38:36.000000000 -0400 ++++ asciidoc-8.4.5/doc/asciidoc.1 2009-08-12 23:51:09.000000000 -0400 +@@ -123,9 +123,9 @@ Auto-number HTML article section titles + \fB-a numbered\fR. + .RE + .PP +-\fB--unsafe\fR ++\fB--safe\fR + .RS 4 +-Disable safe mode. Safe mode is enabled by default, disabling it is potentially dangerous. ++Enable safe mode. Safe mode is disabled by default. + .RE + .PP + \fB-v, --verbose\fR diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 0413759..e266e41 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@

name = kernel version = 3.1.5 -release = 3 +release = 4 thisapp = linux-%{version}

maintainer = Michael Tremer michael.tremer@ipfire.org @@ -35,6 +35,7 @@ build export ICECC=no

requires + asciidoc binutils-devel elfutils-devel gcc-plugin-devel @@ -44,6 +45,7 @@ build net-tools perl python-devel + xmlto xz-lzma-compat end

@@ -290,10 +292,9 @@ build rm -rfv %{BUILDROOT}/lib/firmware

# Install tools. - # XXX Man pages cannot be created because they need asciidoc. make -C tools/perf DESTDIR=%{BUILDROOT} \ HAVE_CPLUS_DEMANGLE=1 prefix=/usr perfexecdir=lib/perf-core \ - install #install-man + install install-man

# cpupower if [ "%{build_cpupower}" = "1" ]; then diff --git a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm index 5289c41..538fef2 100644 --- a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm +++ b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm @@ -5,9 +5,9 @@

name = xorg-x11-drv-mouse version = 1.5.0 -release = 1 +release = 2

-maintainer = Stefan Schantl <stefan.schantl@ipfire.org +maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = X/Driver url = http://www.x.org/ license = MIT @@ -42,7 +42,6 @@ end

packages package %{name} - end

package %{name}-debuginfo template DEBUGINFO

hooks/post-receive -- IPFire 3.x development tree