From 89b0a76b3cd6840731f856b358e33d5771e9e1c5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 10 Dec 2008 19:23:34 -0600 Subject: Remove mention of -b from makepkg manpage Fixes FS#12408. Signed-off-by: Dan McGee --- doc/makepkg.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index b6d9373a..74285aaf 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -116,7 +116,7 @@ Options *-r, \--rmdeps*:: Upon successful build, remove any dependencies installed by makepkg - during dependency auto-resolution (using `-b` or `-s`). + during dependency auto-resolution and installation when using `-s`. *-R, \--repackage*:: Repackage contents of pkg/ without rebuilding the package. This is -- cgit v1.2.3-70-g09d2 From 2f59996c54da473294de4adf44d521299a045a84 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 2 Jan 2009 04:07:13 +1000 Subject: makepkg: detect incorrect usage of provides array Using > or < in the provides array is wrong so make it cause an error. Fixes FS#12540. Also, use bash substitution rather than spawning new processes where possible in the error checking. Move split package detection to a better position. Signed-off-by: Allan McRae [Dan: backport to maint] Signed-off-by: Dan McGee --- doc/PKGBUILD.5.txt | 4 +++- scripts/makepkg.sh.in | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 22c56be3..b0f2bdb6 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -160,7 +160,9 @@ name. The syntax is: `$$source=('filename::url')$$` depend on 'cron' rather than 'dcron OR fcron'. Versioned provisions are also possible, in the 'name=version' format. For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' - dependency of other packages. + dependency of other packages. Provisions involving the '>' and '<' + operators are invalid as only specifc versions of a package may be + provided. *replaces (array)*:: An array of packages that this package should replace, and can be used diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b18665c5..04d2aca1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1439,11 +1439,11 @@ if [ -z "$pkgrel" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgrel" exit 1 fi -if [ $(echo "$pkgver" | grep '-') ]; then +if [ "$pkgver" != "${pkgver//-/}" ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" exit 1 fi -if [ $(echo "$pkgrel" | grep '-') ]; then +if [ "$pkgrel" != "${pkgrel//-/}" ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" exit 1 fi @@ -1465,6 +1465,14 @@ if ! in_array $CARCH ${arch[@]}; then fi fi +for provide in ${provides[@]}; do + if [ $provide != ${provide///} ]; then + error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" + exit 1 + fi +done +unset provide + if [ "$install" -a ! -f "$install" ]; then error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" exit 1 -- cgit v1.2.3-70-g09d2 From bd2de5cdf6e1773e0d661683eed315a3e5261f77 Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Thu, 25 Dec 2008 08:40:52 +0100 Subject: Fix asciidoc manpage creation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As reported here, man pages could no longer be built : http://archlinux.org/pipermail/pacman-dev/2008-December/007726.html I found the explanation here : http://www.methods.co.nz/asciidoc/source-highlight-filter.html "If you use a2x(1) to generate PDF you need to include the --no-xmllint option to suppress xmllint(1) checking — the programlisting language attribute (required by the dblatex source highlighter) is not part of the DocBook 4 specification (but it is in the newer DocBook 5 specification)." Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- doc/Makefile.am | 1 + doc/PKGBUILD.5.txt | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/Makefile.am b/doc/Makefile.am index cce0a711..7992e547 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,6 +62,7 @@ ASCIIDOC_OPTS = \ -a pacman_date="`date +%Y-%m-%d`" \ -a sysconfdir=$(sysconfdir) A2X_OPTS = \ + --no-xmllint \ -d manpage \ -f manpage \ --xsltproc-opts='-param man.endnotes.list.enabled 0' \ diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index b0f2bdb6..416f55e1 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -369,11 +369,10 @@ The following is an example PKGBUILD for the 'patch' package. For more examples, look through the build files of your distribution's packages. For those using Arch Linux, consult the ABS tree. -[sh] -source~~~~~ +[source,sh] +------------------------------- include::PKGBUILD-example.txt[] -source~~~~~ - +------------------------------- See Also -------- -- cgit v1.2.3-70-g09d2