- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pacman/util.c: add missing braces
by Andrew Gregory 04 May '13

04 May '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 8234120..66765b1 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -847,8 +847,9 @@ static void display_transaction_sizes(alpm_list_t *table) struct table_row_t *row = i->data; int len = string_length(row->label); - if(len > max_len) + if(len > max_len) { max_len = len; + } } max_len += 2; -- 1.8.2.2

1 0

[pacman-dev] [RFC] [PATCH] Add makepkg-template
by Florian Pritz 02 May '13

02 May '13

This allows for somewhat easy templating for PKGBUILDs. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Andrew reviewed most of the perl script already, I just got rid of a dependency on File::Slurp afterwards. doc/.gitignore | 1 + doc/Makefile.am | 4 ++ doc/makepkg-template.1.txt | 89 +++++++++++++++++++++++ scripts/.gitignore | 1 + scripts/Makefile.am | 7 ++ scripts/makepkg-template.pl.in | 160 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 262 insertions(+) create mode 100644 doc/makepkg-template.1.txt create mode 100755 scripts/makepkg-template.pl.in diff --git a/doc/.gitignore b/doc/.gitignore index a96ddb3..ad496ce 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,6 +1,7 @@ PKGBUILD.5 libalpm.3 makepkg.8 +makepkg-template.1 makepkg.conf.5 pacman.8 pacman-key.8 diff --git a/doc/Makefile.am b/doc/Makefile.am index bcb05b7..cb01255 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,6 +6,7 @@ ASCIIDOC_MANS = \ pacman.8 \ makepkg.8 \ + makepkg-template.1 \ repo-add.8 \ vercmp.8 \ pkgdelta.8 \ @@ -21,6 +22,7 @@ DOXYGEN_MANS = $(wildcard man3/*.3) HTML_MANPAGES = \ pacman.8.html \ makepkg.8.html \ + makepkg-template.1.html \ repo-add.8.html \ vercmp.8.html \ pkgdelta.8.html \ @@ -46,6 +48,7 @@ EXTRA_DIST = \ asciidoc-override.css \ pacman.8.txt \ makepkg.8.txt \ + makepkg-template.1.txt \ repo-add.8.txt \ vercmp.8.txt \ pkgdelta.8.txt \ @@ -147,6 +150,7 @@ $(HTML_OTHER): asciidoc.conf Makefile.am # Dependency rules pacman.8 pacman.8.html: pacman.8.txt makepkg.8 makepkg.8.html: makepkg.8.txt +makepkg-template.1 makepkg-template.1.html: makepkg-template.1.txt repo-add.8 repo-add.8.html: repo-add.8.txt vercmp.8 vercmp.8.html: vercmp.8.txt pkgdelta.8 pkgdelta.8.html: pkgdelta.8.txt diff --git a/doc/makepkg-template.1.txt b/doc/makepkg-template.1.txt new file mode 100644 index 0000000..cea470a --- /dev/null +++ b/doc/makepkg-template.1.txt @@ -0,0 +1,89 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +makepkg-template(1) +=================== + +Name +---- +makepkg-template - package build templating utility + + +Synopsis +-------- +'makepkg-template' [options] + + +Description +----------- +'makepkg-template' is a script to ease the work of maintaining multiple similar PKGBUILDs. +It allows you to move most of the code from the PKGBUILD into a template file and uses +markers to allow in-place updating of existing PKGBUILDs if the template has been changed. + +Markers are bash comments in the form of: + + # template (start|end); key=value; key2=value2 + +and + + # template end; + +Currently used keys are: name (mandatory), version + +For initial creation there is a shortcut: + + %% template input; key=value; + +If the version is not set, 'makepkg-template' will automatically use the most +recent version of the template, otherwise the specified version will be used +allowing for easier verification of untrused PKGBUILDs if the template is trusted. + +Template files may also contain markers leading to nested templates in the +resulting PKGBUILD. + +Template files should be stored in one directory and filenames should be +"$template_name.$version.template" with a symlink "$template_name.template" +pointing to the most recent template. + +Options +------- + +*-p, \--input* <buildscript>:: + Read the package script `buildscript` instead of the `PKGBUILD` default. + +*-o, \--output* <buildscript>:: + Write the updated file to `buildscript` instead of overwriting the input file. + +*-n, \--newest*:: + Always use the newest available template file. + +*\--template-dir* <dir>:: + Change the dir where we are looking for template files. + +Example PKGBUILD +---------------- + + pkgname=foo-bar + # template start; name=foo-module; version=1.2.3 + _srcdir="$pkgname-$pkgver" + + build() { + cd "$_srcdir" + ./configure + make + } + # template start; name=package-simple; version=1.0 + package() + cd "$_srcdir" + make DESTDIR="$pkgdir" install + } + # template end; + # template end; + + + +See Also +-------- +linkman:makepkg[8], linkman:PKGBUILD[5] + +include::footer.txt[] diff --git a/scripts/.gitignore b/scripts/.gitignore index 9e403bf..26e088b 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,4 +1,5 @@ makepkg +makepkg-template pacman-db-upgrade pacman-key pacman-optimize diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 784b180..bc5d588 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -5,6 +5,7 @@ SUBDIRS = po bin_SCRIPTS = \ $(OURSCRIPTS) \ + makepkg-template \ repo-remove \ repo-elephant @@ -18,6 +19,7 @@ OURSCRIPTS = \ EXTRA_DIST = \ makepkg.sh.in \ + makepkg-template.pl.in \ pacman-db-upgrade.sh.in \ pacman-key.sh.in \ pacman-optimize.sh.in \ @@ -76,6 +78,11 @@ makepkg: \ $(srcdir)/makepkg.sh.in \ $(srcdir)/library/parseopts.sh +makepkg-template: \ + $(srcdir)/makepkg-template.pl.in + $(AM_V_at)$(RM) -f makepkg-template + $(AM_V_at)cp $< $@ + pacman-db-upgrade: \ $(srcdir)/pacman-db-upgrade.sh.in \ $(srcdir)/library/output_format.sh diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in new file mode 100755 index 0000000..d03fd33 --- /dev/null +++ b/scripts/makepkg-template.pl.in @@ -0,0 +1,160 @@ +#!/usr/bin/perl +use warnings; +use strict; +use v5.14; +use Cwd qw(abs_path); +use File::Spec; +use Getopt::Long; +use Pod::Usage; + +my %opts = ( + input => 'PKGBUILD', + template_dir => '/usr/share/makepkg-template', +); + +sub burp { + my ($file_name) = shift; + open (my $fh, ">", $file_name) || die "can't create $file_name $!" ; + print $fh @_; +} + +# read a template marker line and parse values into a hash +# format is "(#|%%) template (start|input|end); key=value; key2=value2; ..." +sub parse_template_line { + my ($line, $filename, $linenumber) = @_; + my %values; + + my @elements = split(/;\s?/, $line); + + foreach my $element (@elements) { + given($element) { + when (/^(?:#|%%) template (.*)$/) { + $values{template} = $1; + } + when (/^([a-z0-9_]+)=(.*);?$/) { + $values{$1} = $2; + } + } + } + + if (!$values{name}) { + die "invalid template line: can't find template name", + "$filename:$linenumber: $line"; + } + + return \%values; +} + +# load a template, process possibly existing markers (nested templates) +sub load_template { + my ($values) = @_; + + my $ret = ""; + + my $path; + if (!$opts{newest} and $values->{version}) { + $path = "$opts{template_dir}/$values->{name}.$values->{version}.template"; + } else { + $path = "$opts{template_dir}/$values->{name}.template"; + } + + # resolve symlink(s) and use the real file's basename for version detection + my $basename = (File::Spec->splitpath(abs_path($path)))[2]; + my ($version) = ($basename =~ /^[^\.]+\.([0-9\.]+)\.template$/); + + my $parsed = process_file($path); + + $ret .= "# template start; name=$values->{name}; version=$version;\n"; + $ret .= $parsed; + $ret .= "# template end;\n"; + return $ret; +} + +# process input file and load templates for all markers found +sub process_file { + my ($filename) = @_; + + my $ret = ""; + my $in_block = 0; + my $linenumber = 0; + + open FH, "<", $filename or die "failed to open '$filename': $!"; + my @lines = <FH>; + close FH; + + foreach my $line (@lines) { + my $add_line = 1; + $linenumber++; + + # special marker to insert a template for the first time + # start with %% in order to create an invalid bash script until replaced + if ($line =~ /^%% template input/) { + my $values = parse_template_line($line, $filename, $linenumber); + $ret .= load_template($values); + $add_line = 0; + } + + if ($line =~ /^# template ([^;]+);?/) { + given ($1) { + # marker followed by code from the template and an end + when ('start') { + my $values = parse_template_line($line, $filename, $linenumber); + + # only process the first template level here + # load_template calls us again if templates are nested + if ($in_block == 0) { + $ret .= load_template($values); + } + $in_block++; + } + + when ('end') { + $in_block--; + $add_line = 0; + } + + default { + die "Unknown template marker '$1'", + "$filename:$linenumber: $line"; + } + } + } + + if ($in_block > 0) { + $add_line = 0; + } + + $ret .= "$line" if $add_line; + } + return $ret; +} + +Getopt::Long::Configure ("bundling"); +GetOptions( + "help" => sub {pod2usage(-exitval => 0, -verbose => 1); }, + "h" => sub {pod2usage(-exitval => 0, -verbose => 0); }, + "input|p=s" => \$opts{input}, + "output|o=s" => \$opts{output}, + "newest|n" => \$opts{newest}, + "template-dir=s" => \$opts{template_dir}, +) or pod2usage(1); + +$opts{output} = $opts{input} unless $opts{output}; + +my $output = process_file($opts{input}); + +burp($opts{output}, $output); + +__END__ +=head1 SYNOPSIS + +makepkg-template [options] + + Options: + --input, -p <file> PKGBUILD to read (default: ./PKGBUILD) + --output, -o <file> file to output to (default: input file) + --newest, -n update templates to newest possible version + (default: use specified version in the template markers) + --template-dir <dir> dir to search for templates (default: /usr/share/makepkg-template) + +=cut -- 1.8.2.2

3 5

[pacman-dev] [PATCH] makepkg: fix --verifysource (FS#35057)
by William Giokas 02 May '13

02 May '13

This should fix both the `use -f to override` and the dependency checking. Signed-off-by: William Giokas <1007380(a)gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index edfca3c..9159b2c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2836,7 +2836,7 @@ if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]]; fi fi -if (( ! PKGVERFUNC )); then +if (( ! PKGVERFUNC && ! VERIFYSOURCE )); then check_build_status fi @@ -2915,7 +2915,7 @@ if (( SOURCEONLY )); then exit 0 fi -if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then +if (( VERIFYSOURCE || NODEPS || (NOBUILD && !DEP_BIN ) )); then # no warning message needed for nobuild if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" -- 1.8.3.rc0.33.gde0977d

3 7

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.1.0-19-g0aa9628
by allan＠archlinux.org 30 Apr '13

30 Apr '13

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 "The official pacman repository". The branch, maint has been updated via 0aa9628560e1ebbb4f4274305504f2f806b67266 (commit) via 91b9ea922ae3db12cbff570718709d4c836c4cbf (commit) via c5a4b35528452855d125cea749fcc4a3a01fca9b (commit) via c1dfdd20109bdd154630df9f9d5465e947aa851e (commit) via 99b8d78bc6ad76a0986614a92db15ee9d76124a8 (commit) via 769facca22db733f0a70ce6a38062d37fe8d2579 (commit) from 597286eb258f841dfc00f65474138fc6192f0092 (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 0aa9628560e1ebbb4f4274305504f2f806b67266 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Apr 30 21:18:42 2013 +1000 Pull translation updates from transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 91b9ea922ae3db12cbff570718709d4c836c4cbf Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Sun Apr 28 21:49:01 2013 -0400 Add -V/--version option to makepkg's usage function and man page Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c5a4b35528452855d125cea749fcc4a3a01fca9b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Apr 26 20:32:37 2013 -0400 makepkg: avoid redirecting stdout If stdout is already redirected, redirecting stderr to stdout can lead to undesirable results. Fixes FS#34974. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c1dfdd20109bdd154630df9f9d5465e947aa851e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Apr 26 12:42:36 2013 +1000 Use libalpm version in pkg-config file We currently use the pacman version number in the libalpm.pc file. It makes more sense to use the libalpm version. Fixes FS#34967. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 99b8d78bc6ad76a0986614a92db15ee9d76124a8 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Tue Apr 23 02:14:29 2013 -0400 Add prepare function to PKGBUILD proto files Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 769facca22db733f0a70ce6a38062d37fe8d2579 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Sun Apr 14 19:33:46 2013 -0700 Fix spelling errors using 'codespell' tool Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- doc/makepkg.8.txt | 3 + lib/libalpm/add.c | 2 +- lib/libalpm/be_package.c | 4 +- lib/libalpm/deps.c | 2 +- lib/libalpm/libalpm.pc.in | 2 +- lib/libalpm/po/ar.po | 37 ++-- lib/libalpm/po/ca.po | 10 +- lib/libalpm/po/cs.po | 10 +- lib/libalpm/po/da.po | 6 +- lib/libalpm/po/de.po | 8 +- lib/libalpm/po/el.po | 14 +- lib/libalpm/po/en_GB.po | 4 +- lib/libalpm/po/eo.po | 2 +- lib/libalpm/po/es.po | 12 +- lib/libalpm/po/fa.po | 2 +- lib/libalpm/po/fi.po | 16 +- lib/libalpm/po/fr.po | 108 ++++----- lib/libalpm/po/gl.po | 6 +- lib/libalpm/po/hr.po | 39 ++-- lib/libalpm/po/hu.po | 8 +- lib/libalpm/po/id.po | 4 +- lib/libalpm/po/it.po | 6 +- lib/libalpm/po/ja.po | 12 +- lib/libalpm/po/kk.po | 6 +- lib/libalpm/po/ko.po | 6 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/lt.po | 12 +- lib/libalpm/po/nb.po | 6 +- lib/libalpm/po/nl.po | 4 +- lib/libalpm/po/pl.po | 6 +- lib/libalpm/po/pt.po | 4 +- lib/libalpm/po/pt_BR.po | 12 +- lib/libalpm/po/ro.po | 12 +- lib/libalpm/po/ru.po | 37 ++-- lib/libalpm/po/sk.po | 10 +- lib/libalpm/po/sl.po | 4 +- lib/libalpm/po/sr.po | 6 +- lib/libalpm/po/sr(a)latin.po | 6 +- lib/libalpm/po/sv.po | 4 +- lib/libalpm/po/tr.po | 8 +- lib/libalpm/po/uk.po | 6 +- lib/libalpm/po/zh_CN.po | 10 +- lib/libalpm/po/zh_TW.po | 6 +- lib/libalpm/signing.c | 2 +- lib/libalpm/util.c | 6 +- m4/pkg.m4 | 2 +- proto/PKGBUILD-split.proto | 8 +- proto/PKGBUILD.proto | 8 +- scripts/library/README | 2 +- scripts/makepkg.sh.in | 3 +- scripts/po/ar.po | 25 ++- scripts/po/ca.po | 13 +- scripts/po/cs.po | 17 +- scripts/po/da.po | 17 +- scripts/po/de.po | 25 ++- scripts/po/el.po | 17 +- scripts/po/en_GB.po | 13 +- scripts/po/eo.po | 8 +- scripts/po/es.po | 40 ++-- scripts/po/fa.po | 8 +- scripts/po/fi.po | 17 +- scripts/po/fr.po | 490 +++++++++++++++++++++++------------------ scripts/po/gl.po | 8 +- scripts/po/hr.po | 11 +- scripts/po/hu.po | 167 +++++++++----- scripts/po/id.po | 11 +- scripts/po/it.po | 13 +- scripts/po/ja.po | 69 +++--- scripts/po/kk.po | 8 +- scripts/po/ko.po | 10 +- scripts/po/lt.po | 23 +- scripts/po/nb.po | 19 +- scripts/po/nl.po | 8 +- scripts/po/pacman-scripts.pot | 10 +- scripts/po/pl.po | 16 +- scripts/po/pt.po | 15 +- scripts/po/pt_BR.po | 17 +- scripts/po/ro.po | 15 +- scripts/po/ru.po | 172 +++++++++------ scripts/po/sk.po | 15 +- scripts/po/sl.po | 12 +- scripts/po/sr.po | 11 +- scripts/po/sr(a)latin.po | 11 +- scripts/po/sv.po | 10 +- scripts/po/tr.po | 13 +- scripts/po/uk.po | 13 +- scripts/po/zh_CN.po | 25 ++- scripts/po/zh_TW.po | 8 +- src/pacman/conf.c | 4 +- src/pacman/pacman.c | 4 +- src/pacman/po/ar.po | 18 +- src/pacman/po/ca.po | 66 +++--- src/pacman/po/cs.po | 24 +- src/pacman/po/da.po | 24 +- src/pacman/po/de.po | 42 ++-- src/pacman/po/el.po | 38 ++-- src/pacman/po/en_GB.po | 20 +- src/pacman/po/eo.po | 14 +- src/pacman/po/es.po | 34 +-- src/pacman/po/fa.po | 18 +- src/pacman/po/fi.po | 42 ++-- src/pacman/po/fr.po | 281 ++++++++++++----------- src/pacman/po/gl.po | 16 +- src/pacman/po/hr.po | 46 ++-- src/pacman/po/hu.po | 33 +-- src/pacman/po/id.po | 18 +- src/pacman/po/it.po | 20 +- src/pacman/po/ja.po | 74 ++++--- src/pacman/po/kk.po | 16 +- src/pacman/po/ko.po | 14 +- src/pacman/po/lt.po | 30 +-- src/pacman/po/nb.po | 26 ++- src/pacman/po/nl.po | 12 +- src/pacman/po/pacman.pot | 14 +- src/pacman/po/pl.po | 18 +- src/pacman/po/pt.po | 30 +-- src/pacman/po/pt_BR.po | 30 +-- src/pacman/po/ro.po | 28 ++- src/pacman/po/ru.po | 204 +++++++++-------- src/pacman/po/sk.po | 26 ++- src/pacman/po/sl.po | 16 +- src/pacman/po/sr.po | 20 +- src/pacman/po/sr(a)latin.po | 20 +- src/pacman/po/sv.po | 18 +- src/pacman/po/tr.po | 24 +- src/pacman/po/uk.po | 24 +- src/pacman/po/zh_CN.po | 42 ++-- src/pacman/po/zh_TW.po | 22 +- src/pacman/util.c | 8 +- test/scripts/parseopts_test.sh | 2 +- 131 files changed, 1986 insertions(+), 1413 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translation] pacman-4.1.1
by Allan McRae 30 Apr '13

30 Apr '13

Hi translators, It is about time for a 4.1.1 release. As always, we tried to minimise the number of string changes for minor releases and we only have 5 new strings. I will be making the release mid next week, so it would be great to have this done by the weekend. Thanks, Allan

1 0

[pacman-dev] [PATCH 4/4] Add --noprepare option to makepkg
by Eric Bélanger 30 Apr '13

30 Apr '13

This new option disables the prepare function. Useful in combination with -o to get an unpatched copy of the sources for testing purpose. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- contrib/bash_completion.in | 2 +- contrib/zsh_completion.in | 1 + doc/makepkg.8.txt | 3 +++ scripts/makepkg.sh.in | 9 +++++++-- test/scripts/parseopts_test.sh | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 28981ae..519aa6d 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -77,7 +77,7 @@ _makepkg() { if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch install key log needed nobuild nocheck nocolor noconfirm nodeps noextract - noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg + noprepare noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg skippgpcheck source syncdeps verifysource version' 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f9d1106..c1fe041 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -583,6 +583,7 @@ _makepkg_longopts=( '--holdver[Prevent automatic version bumping for development PKGBUILDs]' '--key[Specify key to use for gpg signing instead of the default]: :_keys' '--nocheck[Do not run the check() function in the PKGBUILD]' + '--noprepare[Do not run the prepare() function in the PKGBUILD]' '--nosign[Do not create a signature for the package]' '--pkg[Only build listed packages from a split package]' '--sign[Sign the resulting package with gpg]' diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 53a7867..3f2e24d 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -165,6 +165,9 @@ Options *\--nocheck*:: Do not run the check() function in the PKGBUILD or handle the checkdepends. +*\--noprepare*:: + Do not run the prepare() function in the PKGBUILD. + *\--sign*:: Sign the resulting package with gpg, overriding the setting in linkman:makepkg.conf[5]. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 710b76b..13f3610 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2484,6 +2484,7 @@ usage() { printf -- "$(gettext " --holdver Do not update VCS sources")\n" printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" + printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" @@ -2526,7 +2527,7 @@ ARGLIST=("$@") OPT_SHORT="AcdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' - 'nocheck' 'nodeps' 'noextract' 'nosign' 'pkg:' 'repackage' 'rmdeps' + 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') @@ -2565,6 +2566,7 @@ while true; do -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; --nocheck) RUN_CHECK='n' ;; + --noprepare) RUN_PREPARE='n' ;; --nosign) SIGNPKG='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; @@ -2798,7 +2800,10 @@ fi # test for available PKGBUILD functions if declare -f prepare >/dev/null; then - PREPAREFUNC=1 + # "Hide" prepare() function if not going to be run + if [[ $RUN_PREPARE != "n" ]]; then + PREPAREFUNC=1 + fi fi if declare -f build >/dev/null; then BUILDFUNC=1 diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 1693b9f..0d894c9 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -18,7 +18,7 @@ fi OPT_SHORT="AcdefFghiLmop:rRsV" OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean:' 'cleanall' 'nodeps' 'noextract' 'force' 'forcever:' 'geninteg' 'help' 'holdver' - 'install' 'key:' 'log' 'nocolor' 'nobuild' 'nocheck' 'nosign' 'pkg:' 'rmdeps' + 'install' 'key:' 'log' 'nocolor' 'nobuild' 'nocheck' 'noprepare' 'nosign' 'pkg:' 'rmdeps' 'repackage' 'skipinteg' 'sign' 'source' 'syncdeps' 'version' 'config:' 'noconfirm' 'noprogressbar') -- 1.8.2.2

2 1

[pacman-dev] [PATCH 2/2] Add -V/--version option to makepkg's usage function and man page
by Eric Bélanger 30 Apr '13

30 Apr '13

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- doc/makepkg.8.txt | 3 +++ scripts/makepkg.sh.in | 1 + 2 files changed, 4 insertions(+) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ecee63a..bb7a9a3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -144,6 +144,9 @@ Options remote builder, or a tarball upload. Because integrity checks are verified, all source files of the package need to be present or downloadable. +*-V, \--version*:: + Display version information. + *\--allsource*:: Do not actually build the package, but build a source-only tarball that includes all sources, including those that are normally download via diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da620a4..710b76b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2475,6 +2475,7 @@ usage() { printf -- "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")\n" printf -- "$(gettext " -s, --syncdeps Install missing dependencies with %s")\n" "pacman" printf -- "$(gettext " -S, --source Generate a source-only tarball without downloaded sources")\n" + printf -- "$(gettext " -V, --version Show version information and exit")\n" printf -- "$(gettext " --allsource Generate a source-only tarball including downloaded sources")\n" printf -- "$(gettext " --verifysource Download source files (if needed) and perform integrity checks")\n" printf -- "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" -- 1.8.2.2

2 1

[pacman-dev] [PATCH] makepkg: avoid redirecting stdout
by Dave Reisner 28 Apr '13

28 Apr '13

If stdout is already redirected, redirecting stderr to stdout can lead to undesirable results. Fixes FS#34974. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This is somewhat of an RFC. Allan and I were unable to discern why this was originally done from git history. scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da620a4..838d435 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1451,7 +1451,7 @@ run_function() { wait $teepid rm "$logpipe" else - $pkgfunc 2>&1 + "$pkgfunc" fi # reset our shell options eval "$shellopts" -- 1.8.2.1

2 1

[pacman-dev] [PATCH] Use libalpm version in pkg-config file
by Allan McRae 26 Apr '13

26 Apr '13

We currently use the pacman version number in the libalpm.pc file. It makes more sense to use the libalpm version. Fixes FS#34967. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/libalpm.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/libalpm.pc.in b/lib/libalpm/libalpm.pc.in index fe4e258..fdfc8be 100644 --- a/lib/libalpm/libalpm.pc.in +++ b/lib/libalpm/libalpm.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libalpm Description: Arch Linux package management library URL: http://www.archlinux.org/pacman/ -Version: @VERSION@ +Version: @LIB_VERSION@ Cflags: -I${includedir} Libs: -L${libdir} -lalpm Libs.private: @LIBS@ @LIBARCHIVE_LIBS@ @LIBSSL_LIBS@ @LIBCURL_LIBS@ @GPGME_LIBS@ -- 1.8.2.1

1 0

[pacman-dev] [PATCH] doc: Document pkgver() function
by William Giokas 25 Apr '13

25 Apr '13

Originally from Jason St. John's patch, This is a much simplified version explaining some basic functions the four vcs's makepkg supports can use to get package version information. Signed-off-by: William Giokas <1007380(a)gmail.com> --- I know that Allan didn't like this patch last time it was sent in, and neither did I, but I think that this should be documented. I took out the two terrible package versions for the git section, and cut it down to just the commands used to actually print out the pkgver, not the whole pkgver() { cd ... foo bar baz } which makes a lot more sense and keeps things to a minimum. doc/PKGBUILD.5.txt | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index ea280a0..bb185ea 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -450,6 +450,41 @@ The source URL is divided into three components: *svn*;; revision +*pkgver() Function*:: + This function allows 'makepkg' to automatically update the package version of + a package using a script. This is meant to be used with VCS packages. + *Git*:: + *Using git tags*;; + Example output: 1.5.1.g123defa + + git describe --long | sed 's/-/./' + + *Using the total number of commits (used when there are no tags)*;; + Example output: 0.r6283.g123defa + + echo "0.r$(git rev-list --count HEAD).$(git log -1 --format="%h")" + + *Subversion*:: + Example output: 8546 + + svnversion | tr -d [A-z] + + *Mercurial*:: + Example output: 2813.75881cc5391e + + hg identify -ni | awk 'BEGIN{OFS=".";} {print $2 $1}' + + *Bazaar*:: + Example output: 830 + + bzr revno + + *Fallback*:: + If no acceptable version information can be extracted from the + repository, use the current date. + Example output: 20130408 + + date +%Y%m%d Example ------- -- 1.8.2.1.573.g118f60e

5 6