May 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Revise PKGBUILD(5)
by Jason St. John 29 May '13

29 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> Several grammatical errors and minor formatting consistency issues have been resolved in PKGBUILD(5). --- This is a resubmission of a previous patch based on Allan's feedback, which can be found here: https://mailman.archlinux.org/pipermail/pacman-dev/2013-April/016968.html There are some additional changes, but they should be relatively benign. doc/PKGBUILD.5.txt | 132 ++++++++++++++++++++++++++++------------------------- doc/footer.txt | 2 +- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index ea280a0..2b94477 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -48,10 +48,12 @@ similar to `$_basekernver`. The version of the software as released from the author (e.g., '2.7.1'). The variable is not allowed to contain colons or hyphens. + -The `pkgver` variable can be automatically updated by providing a `pkgver()` function -in the PKGBUILD that outputs the new package version. This is run after downloading -and extracting the sources so can use those files in determining the new `pkgver`. -This is most useful when used with sources from version control systems (see below). +The `pkgver` variable can be automatically updated by providing a `pkgver()` +function in the PKGBUILD that outputs the new package version. +This is run after downloading and extracting the sources so it can use those +files in determining the new `pkgver`. +This is most useful when used with sources from version control systems (see +below). *pkgrel*:: This is the release number specific to the Arch Linux release. This @@ -62,7 +64,8 @@ This is most useful when used with sources from version control systems (see bel *pkgdesc*:: This should be a brief description of the package and its functionality. - Try to keep the description to one line of text and not use the package's name. + Try to keep the description to one line of text and to not use the package's + name. *epoch*:: Used to force the package to be seen as newer than any previous versions @@ -75,7 +78,7 @@ This is most useful when used with sources from version control systems (see bel *url*:: This field contains a URL that is associated with the software being - packaged. Typically the project's website. + packaged. This is typically the project's web site. *license (array)*:: This field specifies the license(s) that apply to the package. @@ -91,13 +94,13 @@ This is most useful when used with sources from version control systems (see bel *install*:: Specifies a special install script that is to be included in the package. - This file should reside in the same directory as the PKGBUILD, and will + This file should reside in the same directory as the PKGBUILD and will be copied into the package by makepkg. It does not need to be included in the source array (e.g., `install=$pkgname.install`). *changelog*:: Specifies a changelog file that is to be included in the package. - This file should reside in the same directory as the PKGBUILD, and will + This file should reside in the same directory as the PKGBUILD and will be copied into the package by makepkg. It does not need to be included in the source array (e.g., `changelog=$pkgname.changelog`). @@ -105,10 +108,10 @@ This is most useful when used with sources from version control systems (see bel An array of source files required to build the package. Source files must either reside in the same directory as the PKGBUILD, or be a fully-qualified URL that makepkg can use to download the file. - To make the PKGBUILD as useful as possible, use the `$pkgname` and `$pkgver` - variables if possible when specifying the download location. Compressed files - will be extracted automatically unless found in - the noextract array described below. + To simplify the maintenance of PKGBUILDs, use the `$pkgname` and `$pkgver` + variables when specifying the download location, if possible. + Compressed files will be extracted automatically unless found in the + noextract array described below. + It is also possible to change the name of the downloaded file, which is helpful with weird URLs and for handling multiple source files with the same @@ -118,12 +121,12 @@ makepkg also supports building developmental versions of packages using sources downloaded from version control systems (VCS). For more information, see <<VCS,Using VCS Sources>> below. + -Files in the source array with extensions `.sig`, `.sign` or `.asc` are recognized by -makepkg as PGP signatures and will be automatically used to verify the integrity -of the corresponding source file. +Files in the source array with extensions `.sig`, `.sign` or, `.asc` are +recognized by makepkg as PGP signatures and will be automatically used to verify +the integrity of the corresponding source file. *noextract (array)*:: - An array of filenames corresponding to those from the source array. Files + An array of file names corresponding to those from the source array. Files listed here will not be extracted with the rest of the source files. This is useful for packages that use compressed data directly. @@ -152,10 +155,10 @@ of the corresponding source file. files should use `arch=('any')`. *backup (array)*:: - An array of filenames, without preceding slashes, that + An array of file names, without preceding slashes, that should be backed up if the package is removed or upgraded. This is - commonly used for packages placing configuration files in /etc. See - Handling Config Files in linkman:pacman[8] for more information. + commonly used for packages placing configuration files in '/etc'. See + `"Handling Config Files"` in linkman:pacman[8] for more information. *depends (array)*:: An array of packages this package depends on to run. Entries in @@ -168,7 +171,7 @@ of the corresponding source file. If the dependency name appears to be a library (ends with .so), makepkg will try to find a binary that depends on the library in the built package and append the version needed by the binary. Appending the version yourself -disables auto detection. +disables automatic detection. *makedepends (array)*:: An array of packages this package depends on to build but are not @@ -209,7 +212,7 @@ only specific versions of a package may be provided. + If the provision name appears to be a library (ends with .so), makepkg will try to find the library in the built package and append the correct -version. Appending the version yourself disables auto detection. +version. Appending the version yourself disables automatic detection. *replaces (array)*:: An array of packages this package should replace. This can be used @@ -289,13 +292,13 @@ Packaging Functions ------------------- In addition to the above directives, PKGBUILDs require a set of functions that -provide instructions to build and install the package. As a minimum, the PKGBUILD -must contain a package() function which installs all the package's files into the -packaging directory, with optional prepare(), build() and check() being used to -create those files from source. +provide instructions to build and install the package. As a minimum, the +PKGBUILD must contain a `package()` function which installs all the package's +files into the packaging directory, with optional `prepare()`, `build()`, and +`check()` functions being used to create those files from source. *package() Function*:: - The package() function is used to install files into the directory that + The `package()` function is used to install files into the directory that will become the root directory of the built package and is run after all the optional functions listed below. When specified in combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage @@ -303,41 +306,41 @@ create those files from source. be run as the user calling makepkg. *prepare() Function*:: - An optional prepare() function can be specified in which operations that - are to be run in order to prepare the sources for building (such as - patching) are performed. This function is run after the source extraction - and before the build() function and is skipped when source extraction is - skipped. + An optional `prepare()` function can be specified in which operations to + prepare the sources for building, such as patching, are performed. This + function is run after the source extraction and before the `build()` + function, and the `prepare()` function is skipped when source extraction + is skipped. *build() Function*:: - The optional build() function is use to compile and/or adjust the source - files in preparation to be installed by the package() function. This is - directly sourced and executed by makepkg, so anything that bash or the + The optional `build()` function is use to compile and/or adjust the source + files in preparation to be installed by the `package()` function. This is + directly sourced and executed by makepkg, so anything that Bash or the system has available is available for use here. Be sure any exotic - commands used are covered by `makedepends`. + commands used are covered by the `makedepends` array. + -If you create any variables of your own in the build function, it is -recommended to use the bash `local` keyword to scope the variable to inside -the build function. +If you create any variables of your own in the `build()` function, it is +recommended to use the Bash `local` keyword to scope the variable to inside +the `build()` function. *check() Function*:: - An optional check() function can be specified in which a package's - test-suite may be run. This function is run between the build() and - package() functions. Be sure any exotic commands used are covered by - `checkdepends`. + An optional `check()` function can be specified in which a package's + test-suite may be run. This function is run between the `build()` and + `package()` functions. Be sure any exotic commands used are covered by the + `checkdepends` array. -All of the above variables such as `$pkgname` and `$pkgver` are available for use -in the build function. In addition, makepkg defines the following variables for use -during the build and install process: +All of the above variables such as `$pkgname` and `$pkgver` are available for +use in the `build()` function. In addition, makepkg defines the following +variables for use during the build and install process: *srcdir*:: - This contains the directory where makepkg extracts, or copies, all source - files. + This contains the directory where makepkg extracts, or copies, all source + files. *pkgdir*:: - This contains the directory where makepkg bundles the installed package - (this directory will become the root directory of your built package). - This variable should only be used in the package() function. + This contains the directory where makepkg bundles the installed package. + This directory will become the root directory of your built package. This + variable should only be used in the `package()` function. *startdir*:: This contains the absolute path to the directory where the PKGBUILD is @@ -362,8 +365,8 @@ An optional global directive is available when building a split package: *pkgbase*:: The name used to refer to the group of packages in the output of makepkg - and in the naming of source-only tarballs. If not specified, the first - element in the `pkgname` array is used. The variable is not allowed to + and in the naming of source-only tarballs. If not specified, the first + element in the `pkgname` array is used. The variable is not allowed to begin with a hyphen. Install/Upgrade/Remove Scripting @@ -377,7 +380,7 @@ self-explanatory. Note that during an upgrade operation, none of the install or remove scripts will be called. Scripts are passed either one or two ``full version strings'', where a full -version string is either 'pkgver-pkgrel' or 'epoch:pkgver-pkgrel' if epoch is +version string is either 'pkgver-pkgrel' or 'epoch:pkgver-pkgrel', if epoch is non-zero. *pre_install*:: @@ -415,10 +418,12 @@ reference with all of the available functions defined. Using VCS Sources[[VCS]] ------------------------ -Building a developmental version of a package using sources from a version control -system (VCS) is enabled by specifying the source in the form -`source=('folder::url#fragment')`. Currently makepkg supports the `bzr`, `git`, `hg` and -`svn` protocols. +Building a developmental version of a package using sources from a version +control system (VCS) is enabled by specifying the source in the form +`source=('folder::url#fragment')`. Currently makepkg supports the Bazaar, Git, +Subversion, and Mercurial version control systems. For other version control +systems, manual cloning of upstream repositories must be done in the `prepare()` +function. The source URL is divided into three components: @@ -427,11 +432,12 @@ The source URL is divided into three components: source into. *url*:: - The url to the VCS repo. This must include the the vcs in the URL protocol for - makepkg to recognize this as a VCS source. If the protocol does not include - the VCS name, it can be added by prefixing the URL with `vcs+`. For example, - using a git repository over `http` would have a source URL in the form - `git+http://...`. + The URL to the VCS repository. This must include the VCS in the URL protocol + for makepkg to recognize this as a VCS source. If the protocol does not + include the VCS name, it can be added by prefixing the URL with `vcs+`. For + example, using a Git repository over HTTPS would have a source URL in the + form: + `git+https://...`. *fragment*:: (optional) Allows specifying a revision number or branch for makepkg to checkout @@ -455,7 +461,7 @@ Example ------- 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. +those using Arch Linux, consult the Arch Build System (ABS) tree. [source,sh] ------------------------------- diff --git a/doc/footer.txt b/doc/footer.txt index ccb931c..af19304 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -8,7 +8,7 @@ information on pacman and its related tools. Bugs ---- -Bugs? You must be kidding, there are no bugs in this software. But if we +Bugs? You must be kidding; there are no bugs in this software. But if we happen to be wrong, send us an email with as much detail as possible to mailto:pacman-dev@archlinux.org[]. -- 1.8.3

1 0

[pacman-dev] Removing directory symlink support
by Allan McRae 29 May '13

29 May '13

The bugs in 4.1 are mostly addressed and I will make a 4.1.1 release sometime soon, so now is time to think about pacman-4.2. I wanted to discuss the removal of directory symlink support again because there was not much response on the list last time. Currently, if there is a symlink to a directory on the filesystem, we can treat it like a directory. e.g. Arch Linux has /lib -> usr/lib. So if a package installs a file in /lib, pacman silently puts it in /usr/lib. I'd like to remove that support for the following reasons: 1) It requires we resolve the true path of every directory involved in an upgrade for conflict checking. e.g. /lib/foo.so and /usr/lib/foo.so are conflicts. This has substantial overhead, both in terms of computing and in code. Removing this would mean all symlinks would be treated like a file. 2) We do not handle it very well. e.g. if a package contains a /foo -> some/dir symlink, it needs to be installed before any package with a file in /foo in the same transaction. We "implement" this through flagging a conflict. When the package containing the directory symlink is removed, we need to scan all packages to ensure it is not being "used" by any other package in the local database. This is covered by the _failing_ pactests sync700-702. 3) If packages really want to install files in a directory where there is a symlink, it is easily dealt with in the PKGBUILD. e.g. package() { ln -s usr/lib $pkgdir/lib make DESTDIR=$pkgdir rm $pkgdir/lib } 4) There is no use case for it (at least on linux). I have only ever seen this used as a poor man's bind mount. 5) It believe it would actually make replacing /bin and /sbin able to occur in a single transaction (no --ignore filesystem) as we can replace a completely removed directory by a file. Any comments here? I see there is a patchset already available that does most (all?) of the removal. What we would need is to have something like a pacman-db-upgrade that changed filelists to avoid symlink paths. E.g a package with /lib/foo haves its filelist adjusted to /usr/lib/foo. The other option is to have testdb check for these and advise people to run that before updating to pacman-4.2? Any comments? Allan

4 25

[pacman-dev] [PATCH 3/3] Remove backslash typo from makepkg man page
by Eric Bélanger 29 May '13

29 May '13

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- doc/makepkg.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index bb7a9a3..53a7867 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -17,7 +17,7 @@ Synopsis Description ----------- 'makepkg' is a script to automate the building of packages. The requirements for -using the script are a build-capable \*nix platform and a custom build script +using the script are a build-capable *nix platform and a custom build script for each package you wish to build (known as a PKGBUILD). See linkman:PKGBUILD[5] for details on creating your own build scripts. -- 1.8.2.2

3 4

[pacman-dev] [PATCH v4] Add makepkg-template
by Florian Pritz 29 May '13

29 May '13

This allows for somewhat easy templating for PKGBUILDs. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- v4: - added support for "-" to --input and --output (stdin/stdout) - adapted manpage and fixed ordering of the arguments to the example diff call - lots of code suggestion + fixes by Andrew Dave raised that questions: Do we care that my diff example in the manpage uses "<()" which is a bashism? Given it's only an example and should be understandable even if you don't use bash I think it's better to keep it short rather than have it work everywhere. Opinions welcome. configure.ac | 9 +++ doc/.gitignore | 1 + doc/Makefile.am | 4 + doc/makepkg-template.1.txt | 132 ++++++++++++++++++++++++++++++++ scripts/.gitignore | 1 + scripts/Makefile.am | 11 +++ scripts/makepkg-template.pl.in | 167 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 325 insertions(+) create mode 100644 doc/makepkg-template.1.txt create mode 100755 scripts/makepkg-template.pl.in diff --git a/configure.ac b/configure.ac index 81bc1b3..3b0c62c 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,11 @@ AC_ARG_WITH(buildscript, AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]), [BUILDSCRIPT=$withval], [BUILDSCRIPT=PKGBUILD]) +# Help line for buildscript filename +AC_ARG_WITH(template-dir, + AS_HELP_STRING([--with-template-dir=name], [set the template dir used by makepkg-template]), + [TEMPLATE_DIR=$withval], [TEMPLATE_DIR=/usr/share/makepkg-template]) + # Help line for debug package suffix AC_ARG_WITH(debug-suffix, AS_HELP_STRING([--with-debug-suffix=name], [set the suffix for split debugging symbol packages used by makepkg]), @@ -457,6 +462,9 @@ AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman sourc # Set makepkg build script name AC_SUBST(BUILDSCRIPT) AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg]) +# Set makepkg-template template dir +AC_SUBST(TEMPLATE_DIR) +AC_DEFINE_UNQUOTED([TEMPLATE_DIR], "$TEMPLATE_DIR", [The template dir used by makepkg-teplate]) # Set makepkg split debugging symbol package suffix AC_SUBST(DEBUGSUFFIX) AC_DEFINE_UNQUOTED([DEBUGSUFFIX], "$DEBUGSUFFIX", [The suffix for debugging symbol packages used by makepkg]) @@ -524,6 +532,7 @@ ${PACKAGE_NAME}: package extension : ${PKGEXT} source pkg extension : ${SRCEXT} build script name : ${BUILDSCRIPT} + template dir : ${TEMPLATE_DIR} Compilation options: Use libcurl : ${have_libcurl} 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..2f86e8f --- /dev/null +++ b/doc/makepkg-template.1.txt @@ -0,0 +1,132 @@ +///// +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. + +Template files can contain any code allowed in a PKGBUILD. You can think of +them like external files included with "." or "source", but they will be +inlined into the PKGBUILD by 'makepkg-template' so you do not depend on the +template file if you wish to build the package. + +Markers are bash comments in the form of: + + # template start; key=value; key2=value2; ... + +and + + # template end; + +Currently used keys are: name (mandatory) and version. Values are limited to +alphanumerics, "@", "+", ".", "-" and "_". + +For initial creation there is a one line shortcut which doesn't need an end: + + # template input; key=value; + +If you use this 'makepkg-template' will replace it with start and end markers +and the template code on the first run. + +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. + +If the version is not set in the marker, 'makepkg-template' will automatically +use the most recent version of the template, otherwise the specified version +will be used. + +This allows for easier verification of untrused PKGBUILDs if the template is +trusted. You verify the non-template code and then use a command similar to +this: + + diff -u <(makepkg-template -o -) PKGBUILD + +Template files may also contain markers leading to nested templates in the +resulting PKGBUILD. If you use markers in a template, please set the version +you used/tested with in the start/input marker so other people can properly +recreate from templates. + +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=perl-config-simple + pkgver=4.58 + pkgrel=1 + pkgdesc="simple configuration file class" + arch=(any) + license=(PerlArtistic GPL) + depends=('perl') + source=("http://search.cpan.org/CPAN/authors/id/S/SH/SHERZODR/Config-Simple-${pkgver…") + md5sums=(f014aec54f0a1e2e880d317180fce502) + _distname="Config-Simple" + + # template start; name=perl-module; version=1.0; + options=(!emptydirs) + _distdir="${_distname}-${pkgver}" + url="https://metacpan.org/release/${_distname}" + + build() { + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$srcdir/$_distdir" + /usr/bin/perl Makefile.PL + make + } + + check() { + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$srcdir/$_distdir" + make test + } + + package() { + cd "$srcdir/$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete + } + # 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..1f3bae2 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 \ @@ -54,6 +56,7 @@ edit = sed \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ + -e 's|@TEMPLATE_DIR[@]|$(TEMPLATE_DIR)|g' \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ @@ -76,6 +79,14 @@ makepkg: \ $(srcdir)/makepkg.sh.in \ $(srcdir)/library/parseopts.sh +makepkg-template: \ + $(srcdir)/makepkg-template.pl.in \ + Makefile + + $(AM_V_at)$(RM) -f makepkg-template + $(AM_V_GEN)$(edit) $< > $@ + $(AM_V_at)chmod +x,a-w $@ + 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..568ad6b --- /dev/null +++ b/scripts/makepkg-template.pl.in @@ -0,0 +1,167 @@ +#!/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 => '@BUILDSCRIPT@', + template_dir => '@TEMPLATE_DIR@', +); + +my $template_name_charset = qr/[[:alnum:]+_.@-]/; +my $template_marker = qr/# template/; + +sub burp { + my ($file_name, @lines) = @_; + open (my $fh, ">", $file_name) || die "can't create $file_name $!" ; + print $fh @lines; + close $fh; +} + +# read a template marker line and parse values into a hash +# format is "# template (start|input); key=value; key2=value2; ..." +sub parse_template_line { + my ($line, $filename, $linenumber) = @_; + my %values; + + my ($marker, @elements) = split(/;\s?/, $line); + + ($values{command}) = ($marker =~ /$template_marker (.*)/); + + foreach my $element (@elements) { + my ($key, $val) = ($element =~ /^([a-z0-9]+)=(.*)$/); + die "invalid key/value pair $filename:$linenumber: $line" + unless $key and $val; + $values{$key} = $val; + } + + # end doesn't take arguments + if ($values{command} ne "end") { + if (!$values{name}) { + die "invalid template line: can't find template name\n", + "$filename:$linenumber: $line"; + } + + unless ($values{name} =~ /^$template_name_charset+$/) { + die "invalid chars used in name '$values{name}'. allowed: [:alnum:]+_.@-\n", + "$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 name for version detection + my ($version) = (abs_path($path) =~ /-([0-9.]+)[.]template$/); + + if (!$version) { + die "Couldn't detect version for template '$values->{name}'"; + } + + 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 $nesting_level = 0; + my $linenumber = 0; + + open (my $fh, "<", $filename) or die "failed to open '$filename': $!"; + my @lines = <$fh>; + close $fh; + + foreach my $line (@lines) { + $linenumber++; + + if ($line =~ $template_marker) { + my $values = parse_template_line($line, $filename, $linenumber); + + given ($values->{command}) { + when (['start', 'input']) { + if ($nesting_level == 0) { + $ret .= load_template($values); + } + } + + when ('end') { + # nothing to do here, just for completeness + } + + default { + die "Unknown template marker '$values->{command}'\n", + "$filename:$linenumber: $line"; + } + } + + $nesting_level++ if $values->{command} eq "start"; + $nesting_level-- if $values->{command} eq "end"; + + # marker lines should never be added + next; + } + + # we replace code inside blocks with the template + # so we ignore the content of the block + next if $nesting_level > 0; + + $ret .= $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}; + +$opts{input} = "/dev/stdin" if $opts{input} eq "-"; +$opts{output} = "/dev/stdout" if $opts{output} eq "-"; + +burp($opts{output}, process_file($opts{input})); + +__END__ +=head1 SYNOPSIS + +makepkg-template [options] + + Options: + --input, -p <file> PKGBUILD to read (default: @BUILDSCRIPT@) + --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: @TEMPLATE_DIR@) + +=cut +# vim: set noet: -- 1.8.2.2

3 12

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.1-28-g7ea58d0
by allan＠archlinux.org 29 May '13

29 May '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, master has been updated via 7ea58d09f69a9a13b637e7128e7b882ac2bebc64 (commit) via 4fadcbfab2c8fbc78d7ca5d824b86ae0043d42fa (commit) via dc08eca368de31b85e27063160e73b75b91bc58f (commit) via 9555ec714a2113144b0bb09e468662d67f60857e (commit) via e5dd8c2ac561173c93849c4baab6be2406679be5 (commit) via 5bcc058d4217a3e843e9adfbe0d8882ddf0f31b1 (commit) via a975523fb97fdb65245f3d3a4e0c581c9dbeef3f (commit) via dece66ac180ccc9fa0854e2bb181cd7585ac81a3 (commit) via 3b4e74cb3b2a2964b28c85bde46ac826d2f196b0 (commit) via 28dd29dedbc0a0e7fe1514043944b35aec8d2949 (commit) via 296e630edd129989856b1ebfaa7e8497a90bc937 (commit) via 84ac55b0529b6489da38ebfc56a988228aa4859a (commit) via 7d2c7fb347e8b5ea89127f3f8b4a545772394600 (commit) via d235f541143026aa59d012d7083a41c43a622eeb (commit) via 8335e169a6f38c288db4249c3d272a9ced332580 (commit) via 1ed881fed31952c65f9606df5e265c36221974e9 (commit) via 090c4006d748e0ec50b74e974b4f1fa6f3d6c1ec (commit) via 8be08f7cae8257af6866febc9d2a57d8d8601a51 (commit) via 72c6d19d64a89a5ad0d162fc0bb6517ea80fc252 (commit) from 0f988beff8794338485352dc1beafbfcdbb20db1 (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 7ea58d09f69a9a13b637e7128e7b882ac2bebc64 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Tue May 28 13:39:56 2013 +0200 Update example PKGBUILD Update doc/PKGBUILD-example.txt with several changes from the official Arch Linux package for patch-2.7.1-1, including other changes shown below: -- replaces spaces with tabs in functions -- replaces 'make prefix=' with 'make DESTDIR=' -- improves quoting of the "cd" command in functions Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4fadcbfab2c8fbc78d7ca5d824b86ae0043d42fa Author: Jason St. John <jstjohn(a)purdue.edu> Date: Tue May 28 12:54:52 2013 +0200 Quote sources in PKGBUILD prototypes and example PKGBUILD Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dc08eca368de31b85e27063160e73b75b91bc58f Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 19 22:41:01 2013 +1000 Improve error message when package is missing required signature When attempting to install a package (either via -S or -U) and the signature is missing, the current error message "invalid or corrupted package (PGP signature)" is very unclear. Instead inform the user that the package is missing the required signature. Partial fix for FS#34741. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9555ec714a2113144b0bb09e468662d67f60857e Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat May 18 19:39:36 2013 -0400 pacman.8: document .pacorig files Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e5dd8c2ac561173c93849c4baab6be2406679be5 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat May 18 19:37:59 2013 -0400 add.c: refactor backup file modification checks The previous implementation was overly complex with unnecessary checks and nested conditionals. By reordering the tests and changing them to all be checks for positive hash matches rather than non-matches, we can collapse several cases and make the process much more linear. This removes the need to set hash_orig = "" just to reach some of the checks and corrects a faulty assumption that files are equivalent when the hashing process fails. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5bcc058d4217a3e843e9adfbe0d8882ddf0f31b1 Author: Phillip Smith <fukawi2(a)gmail.com> Date: Tue Apr 30 09:10:08 2013 +1000 makepkg: add support for CARCH environment var Add support for overriding configuration in /etc/makepkg.conf and ~/.makepkg.conf by setting the environment variable CARCH similar to how SRCDEST and PKGDEST behave. Fixes FS#35030. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a975523fb97fdb65245f3d3a4e0c581c9dbeef3f Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 19 00:20:01 2013 +1000 Clean partial downloads from cache When using "pacman -Sc" to clean the cache, it make sense to also remove partially downloaded files. Fixes FS#34317. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dece66ac180ccc9fa0854e2bb181cd7585ac81a3 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 19 00:03:36 2013 +1000 makepkg: remove support for PKGBUILDs without a package() function Not having a package() function means all building occurs as root and repackaging can lose permissions. Given the use of package() functions has been around for years and we deprecated not having one in pacman-4.1, we can remove support for PKGBUILDs without package() functions altogether. However, keep PKGBUILDs that have neither a build() or package() function working. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3b4e74cb3b2a2964b28c85bde46ac826d2f196b0 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 18 23:43:27 2013 +1000 makepkg: Add helper to test for functions in build script Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 28dd29dedbc0a0e7fe1514043944b35aec8d2949 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 18 22:47:35 2013 +1000 makepkg: remove sourcing PKGBUILD from stdin Using PKGBUILDs from stdin means that we can not use pkgver() in packages. Given we have the "-p" option to pass any file to makepkg and passing a PKGBUILD in the form "cat foo | makepkg" does not work, this feature is unneeded. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 296e630edd129989856b1ebfaa7e8497a90bc937 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri May 10 14:19:05 2013 -0400 pmtest: set LC_ALL=C in subprocess.call LC_ALL=C is required to force pacman's output to English for tests that rely on that output, but setting it in Makefile.am results in those tests breaking under different locales when pactest.py is run directly. This will also ease an eventual transition to python3 which LC_ALL=C causes to default to ascii encoded strings, creating problems for tests with unicode strings. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 84ac55b0529b6489da38ebfc56a988228aa4859a Merge: 0f988be 7d2c7fb Author: Allan McRae <allan(a)archlinux.org> Date: Wed May 29 14:02:56 2013 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- NEWS | 22 ++++----- contrib/checkupdates.sh.in | 2 +- contrib/paccache.sh.in | 7 ++- doc/PKGBUILD-example.txt | 23 +++++---- doc/makepkg.8.txt | 4 ++ doc/pacman.8.txt | 5 ++ lib/libalpm/add.c | 117 ++++++++++++++++++++++----------------------- lib/libalpm/alpm.h | 1 + lib/libalpm/be_package.c | 6 ++- lib/libalpm/deps.c | 2 +- lib/libalpm/error.c | 2 + proto/PKGBUILD-split.proto | 4 +- proto/PKGBUILD.proto | 4 +- scripts/makepkg.sh.in | 109 +++++++++++++++++------------------------ src/pacman/sync.c | 4 +- test/pacman/pmtest.py | 2 +- 17 files changed, 155 insertions(+), 161 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.1.1-7-g7d2c7fb
by allan＠archlinux.org 29 May '13

29 May '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 7d2c7fb347e8b5ea89127f3f8b4a545772394600 (commit) via d235f541143026aa59d012d7083a41c43a622eeb (commit) via 8335e169a6f38c288db4249c3d272a9ced332580 (commit) via 1ed881fed31952c65f9606df5e265c36221974e9 (commit) via 090c4006d748e0ec50b74e974b4f1fa6f3d6c1ec (commit) via 8be08f7cae8257af6866febc9d2a57d8d8601a51 (commit) via 72c6d19d64a89a5ad0d162fc0bb6517ea80fc252 (commit) from a4a7336dff8155cfeb37341d1e9e56092439bae6 (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 7d2c7fb347e8b5ea89127f3f8b4a545772394600 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Tue May 28 15:58:00 2013 +0200 Fix various typos in NEWS imporve -> improve diskspace -> disk space BTRFS -> Btrfs filelists -> file lists filesize -> file size Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d235f541143026aa59d012d7083a41c43a622eeb Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 19 22:53:06 2013 +1000 Remove incorrect bug number from NEWS The wrong bug number is mentioned in commit 32327dc8 and this was perpetuated into the NEWS file. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8335e169a6f38c288db4249c3d272a9ced332580 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 18 23:11:41 2013 +1000 makepkg: Use LOGDEST for logpipe If LOGDEST is set, we may not check that $startdir is writable. Store the log pipe in LOGDEST instead. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1ed881fed31952c65f9606df5e265c36221974e9 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 18 22:43:12 2013 +1000 Fix comment typo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 090c4006d748e0ec50b74e974b4f1fa6f3d6c1ec Author: William Giokas <1007380(a)gmail.com> Date: Wed May 15 11:25:58 2013 -0500 contrib: Remove harcoded /etc/pacman.conf Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8be08f7cae8257af6866febc9d2a57d8d8601a51 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed May 15 09:58:43 2013 -0400 Revert "paccache: avoid subshell in calling runcmd" su is terribad. In addition to reverting, this also removes support for privilege escalation via su. If you want to use paccache as root and fail to comprehend how much better sudo is than su, then run paccache directly via su. Fixes FS#35173. This reverts commit 597286eb258f841dfc00f65474138fc6192f0092. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 72c6d19d64a89a5ad0d162fc0bb6517ea80fc252 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed May 15 09:58:42 2013 -0400 makepkg: fixup broken revision and repo references bzr support "worked", but didn't handle any of the actual features we wanted with makepkg. This moves the revision specification to the proper place (extraction, rather than download), and fixes an additional broken reference to $repo which was never set. Fixes FS#35281. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 22 +++++++++++----------- contrib/checkupdates.sh.in | 2 +- contrib/paccache.sh.in | 7 +++---- lib/libalpm/deps.c | 2 +- scripts/makepkg.sh.in | 38 +++++++++++++++++++------------------- 5 files changed, 35 insertions(+), 36 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix various typos in NEWS
by Jason St. John 29 May '13

29 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> imporve -> improve diskspace -> disk space BTRFS -> Btrfs filelists -> file lists filesize -> file size Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- NEWS | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 6fdb5d5..d3c1548 100644 --- a/NEWS +++ b/NEWS @@ -5,7 +5,7 @@ VERSION DESCRIPTION - various translation fixes and updates (FS#34395, FS#34704, FS#34716, FS#35097) - makepkg: - - imporve SVN VCS PKGBUILD handling (FS#34675, FS#34636) + - improve SVN VCS PKGBUILD handling (FS#34675, FS#34636) - allow "lp:" URLs for BZR sources (FS#34650) - prevent pkgver() capturing stderr (FS#34974) - fix attempt to remove package twice on failure (FS#34672) @@ -30,7 +30,7 @@ VERSION DESCRIPTION - configure shell for running install scriptlets (FS#20557) - make path to ldconfig configurable - display repo in VerbosePkgLists output (FS#26334) - - do not check file conflicts or diskspace with --dbonly + - do not check file conflicts or disk space with --dbonly (FS#25667) - UseDelta takes a ratio for the largest delta to use - track how installed packages were validated (FS#28040) @@ -94,14 +94,14 @@ VERSION DESCRIPTION - use full delta size as max download size (FS#28345) - improved handling and fix crash after failed downloads - fix key lookup when using gpg 2.X as GPG program - - match only full path components in diskspace checking - - skip diskspace checks when using --dbonly + - match only full path components in disk space checking + - skip disk space checks when using --dbonly - scripts: unset CDPATH bash variable in all scripts - makepkg: - fix syntax error in remove_deps (FS#28448) - small fixes related to multiple libdeps, parsing issues - exit via default handler in trap_exit (FS#28491) - - attempt to work around BTRFS file/block size reporting issues + - attempt to work around Btrfs file/block size reporting issues - pacman-key: - remove signature verification in --populate - make -e option work as advertised without arguments @@ -177,8 +177,8 @@ VERSION DESCRIPTION - split package verification and load stages - sync database reading refactor for performance - use a larger buffer for package checksum validation - - filelists now have a dedicated type with metadata - - diskspace check no longer requires iterating package archives + - file lists now have a dedicated type with metadata + - disk space check no longer requires iterating package archives - update and add checksum routines from PolarSSL - validate sync database sha256sum if available - correctly parse sizes in database > 2GiB @@ -240,7 +240,7 @@ VERSION DESCRIPTION - fix default path substitution in documentation - makepkg: quote variables that may contain spaces (FS#24002) - makepkg: fix creation of source package with -p (FS#24567) - - repo-add: include dotfiles in filelists (FS#24534) + - repo-add: include dotfiles in file lists (FS#24534) - minor translation updates: de, fi, fr, sk, zh_CN 3.5.2 - ensure we show correct missing dependency info (FS#23424) - pacman usage/--help updates (FS#23433, FS#23369) @@ -387,7 +387,7 @@ VERSION DESCRIPTION - translations: - zh_CN: fix positional parameter usage in makepkg (FS#16983) - el: fix Y/N response translation (FS#16568) -3.3.2 - fix infinite filesize download issue (FS#16359) +3.3.2 - fix infinite file size download issue (FS#16359) - fix bogus download size on TotalDownload - documentation updates - small translation updates @@ -658,7 +658,7 @@ VERSION DESCRIPTION - conflicts checking speedups and fixes - move lockfile location to inside the DB - remove gettext calls from DEBUG messages - - remove faulty diskspace checking + - remove faulty disk space checking - move functions out of alpm.c to where they belong - rewrite of file extraction code (FS#7484) - makepkg-specific changes: -- 1.8.3

2 1

[pacman-dev] [PATCH] Update example PKGBUILD
by Jason St. John 29 May '13

29 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> Update doc/PKGBUILD-example.txt with several changes from the official Arch Linux package for patch-2.7.1-1, including other changes shown below: -- replaces spaces with tabs in functions -- replaces 'make prefix=' with 'make DESTDIR=' -- improves quoting of the "cd" command in functions Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmission requested by Allan that simplifies the PKGBUILD. doc/PKGBUILD-example.txt | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt index 00dd8b1..910fd06 100644 --- a/doc/PKGBUILD-example.txt +++ b/doc/PKGBUILD-example.txt @@ -1,24 +1,27 @@ # Maintainer: Joe User <joe.user(a)example.com> pkgname=patch -pkgver=2.5.4 -pkgrel=3 +pkgver=2.7.1 +pkgrel=1 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64') url="https://www.gnu.org/software/patch/patch.html" license=('GPL') groups=('base-devel') -depends=('glibc' 'ed') -source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('ee5ae84d115f051d87fcaaef3b4ae782') +depends=('glibc') +makedepends=('ed') +optdepends=('ed: for "patch -e" functionality') +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('e9ae5393426d3ad783a300a338c09b72' + 'SKIP') build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr - make + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make } package() { - cd "$srcdir"/$pkgname-$pkgver - make prefix="$pkgdir"/usr install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install } -- 1.8.3

2 1

[pacman-dev] [PATCH 1/2] Quote sources in PKGBUILD prototypes and example PKGBUILD
by Jason St. John 28 May '13

28 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- Resubmission containing Allan's requested change to PKGBUILD-example.txt doc/PKGBUILD-example.txt | 2 +- proto/PKGBUILD-split.proto | 4 ++-- proto/PKGBUILD.proto | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt index 9ab5dff..00dd8b1 100644 --- a/doc/PKGBUILD-example.txt +++ b/doc/PKGBUILD-example.txt @@ -9,7 +9,7 @@ url="https://www.gnu.org/software/patch/patch.html" license=('GPL') groups=('base-devel') depends=('glibc' 'ed') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('ee5ae84d115f051d87fcaaef3b4ae782') build() { diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 672e7df..54e5557 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgbase-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgbase-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index d4c01b8..5b854ce 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgname-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgname-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' -- 1.8.3

2 2

[pacman-dev] [PATCH] Quote sources in PKGBUILD prototypes
by Jason St. John 28 May '13

28 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> --- Does this require further explanation? proto/PKGBUILD-split.proto | 4 ++-- proto/PKGBUILD.proto | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 672e7df..54e5557 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgbase-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgbase-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index d4c01b8..5b854ce 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgname-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgname-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' -- 1.8.3

2 1