- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Do not remove source code references in PO/POT files
by Allan McRae 02 Feb '14

02 Feb '14

From: Rafael Ferreira <josephgbr(a)archlinux.info> FS#34240. This is useful for translators and has little cost to us since we moved to transifex for translations. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/po/Makevars | 2 +- scripts/po/Makevars | 2 +- src/pacman/po/Makevars | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/po/Makevars b/lib/libalpm/po/Makevars index 09fb353..21bc008 100644 --- a/lib/libalpm/po/Makevars +++ b/lib/libalpm/po/Makevars @@ -8,7 +8,7 @@ subdir = lib/libalpm/po top_builddir = ../../../ # These options get passed to xgettext. -XGETTEXT_OPTIONS = --no-location \ +XGETTEXT_OPTIONS = \ --keyword=_ --flag=_:1:c-format \ --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format diff --git a/scripts/po/Makevars b/scripts/po/Makevars index 494da1d..f658289 100644 --- a/scripts/po/Makevars +++ b/scripts/po/Makevars @@ -8,7 +8,7 @@ subdir = scripts/po top_builddir = ../../ # These options get passed to xgettext. -XGETTEXT_OPTIONS = --no-location +XGETTEXT_OPTIONS = # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding diff --git a/src/pacman/po/Makevars b/src/pacman/po/Makevars index 4e34304..ea30f05 100644 --- a/src/pacman/po/Makevars +++ b/src/pacman/po/Makevars @@ -8,7 +8,7 @@ subdir = src/pacman/po top_builddir = ../../../ # These options get passed to xgettext. -XGETTEXT_OPTIONS = --no-location \ +XGETTEXT_OPTIONS = \ --keyword=_ --flag=_:1:c-format \ --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format -- 1.8.5.3

1 0

[pacman-dev] [PATCH] Prevent makepkg creating armored signatures
by Allan McRae 02 Feb '14

02 Feb '14

From: Lars Gustäbel <lars(a)gustaebel.de> If the user has "armor" in thier gpg.conf, makepkg will create an ascii-armored signature. Use --no-armor in the gpg call to avoid. FS#38503. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- 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 7d8a676..e3d9a93 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1968,7 +1968,7 @@ create_signature() { SIGNWITHKEY="-u ${GPGKEY}" fi # The signature will be generated directly in ascii-friendly format - gpg --detach-sign --use-agent ${SIGNWITHKEY} "$filename" &>/dev/null || ret=$? + gpg --detach-sign --use-agent ${SIGNWITHKEY} --no-armor "$filename" &>/dev/null || ret=$? if (( ! ret )); then -- 1.8.5.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-283-ge4f6edf
by allan＠archlinux.org 02 Feb '14

02 Feb '14

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 e4f6edf2374185c76a1f42a1aa6156d479bc6f40 (commit) via 1e07af1b0a16d9f8e42a76d00de8558e49cb57b7 (commit) via fe19a0c58d8c2d5b8fa6ca4a55647bbfe6bf5b51 (commit) via 15f4144e12c48283bdcfef50fec64b4040b0000a (commit) via 135d862eb6e3051e351888b08c94529c967c5387 (commit) via 6fb2035dd03f3ee33f945cacee4e835156e1f76b (commit) via c71efe6d62ad205d479b3872851d9ace4885677f (commit) via f5299d17523b1fc7ce5c36f852de3d6575e71327 (commit) via 6268e66efaae690ea7df1a8b84913fdf8528874c (commit) via ccabeafb3d489dfe285626b2fc2f7d2024d7aa7f (commit) via 3dc87ec59a675798df30904b99cb4bfa657a4fb5 (commit) via edce7555a6b7410d1a4da6d27d22383989306ccc (commit) via aa4d3298fb6d46bec3d8996ff8c7ec8c9cc50db9 (commit) via c2edd31eae73c9a4bf7b62e41a12fd5c3bba2ce0 (commit) via fac9ac6c4011ff643b7335c7381f6219b07bba80 (commit) via 4d68092e2fd8c8a3b6da39e509ad48db0fc9ed7a (commit) via 6be08f76f6c4188f0aa4d0a4d88595a898bf3d3b (commit) via 819b4cd54e3caec4d3803cc62772369031ed0847 (commit) via 77da9dc9748b3f151f98c4c301e8da3a2551860d (commit) via cb8eae24c9976c023c8ec2aff9bf305202edc4d7 (commit) via d895cae16cc97e5f1e3f95eb748a99161678f8ee (commit) via aabb7c3cddf5e97d1b1ebb3548664f1af85c1392 (commit) via 7ae25ac67fd4dd087791be55fa3c4997be7aac52 (commit) via 333373f90e515bbaf6997dc7bf7385fe114689b2 (commit) from 5be7b6a1b2e197a6d185fc6223ff1e7acc4c3e27 (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 e4f6edf2374185c76a1f42a1aa6156d479bc6f40 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:09 2014 +0100 pacsearch: CLI option to turn off colors Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e07af1b0a16d9f8e42a76d00de8558e49cb57b7 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:08 2014 +0100 pacsearch: using pacman color theme No more per-repo coloring: this was not Arch-agnostic, and there is no reasonable, simple way to color repos in a consistant manner with only 6 colors. 'local' is in red: this way we benefit from the pacman -Ss && pacman -Qs combo. to_color subroutine: it takes an array instead of a string, this is faster and simpler. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fe19a0c58d8c2d5b8fa6ca4a55647bbfe6bf5b51 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:07 2014 +0100 pacsearch: colors are portable (ANSI) and have natural variable names Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15f4144e12c48283bdcfef50fec64b4040b0000a Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:06 2014 +0100 pacsearch: Explicitly extract group information Also store pkgname and pkgver separately. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 135d862eb6e3051e351888b08c94529c967c5387 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:05 2014 +0100 pacsearch: localized output Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6fb2035dd03f3ee33f945cacee4e835156e1f76b Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:04 2014 +0100 pacsearch: more accurate help message Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c71efe6d62ad205d479b3872851d9ace4885677f Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:03 2014 +0100 pacsearch: Copyright year bump Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f5299d17523b1fc7ce5c36f852de3d6575e71327 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Sat Feb 1 19:42:44 2014 -0500 makepkg.conf(5): Fix and improve grammar and spelling issues Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6268e66efaae690ea7df1a8b84913fdf8528874c Author: Jason St. John <jstjohn(a)purdue.edu> Date: Sat Feb 1 21:28:09 2014 -0500 Remove ChangeLog.proto and move important info to PKGBUILD(5) The change log prototype should be distribution determined. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ccabeafb3d489dfe285626b2fc2f7d2024d7aa7f Author: Jason St. John <jstjohn(a)purdue.edu> Date: Sat Feb 1 20:43:18 2014 -0500 makepkg.conf(5): Add missing backticks around vars, and use single quotes around "gpg" command Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3dc87ec59a675798df30904b99cb4bfa657a4fb5 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Sat Feb 1 19:04:07 2014 -0500 proto: Remove recommendation of "makepkg -g" in comments This recommendation encouraged the practice of not checking the checksums provided upstream. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit edce7555a6b7410d1a4da6d27d22383989306ccc Author: Maxime Gauduin <alucryd(a)gmail.com> Date: Tue Jan 28 14:49:47 2014 +0100 Add PKGBUILD-vcs.proto This PKGBUILD proto covers the newly introduced VCS capabilities of pacman. It serves as a replacement for the current bzr, git, hg and svn protos found in ABS. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> [Allan: add to Makefile.am] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa4d3298fb6d46bec3d8996ff8c7ec8c9cc50db9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:26 2014 -0500 table_display: free memory on errors Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c2edd31eae73c9a4bf7b62e41a12fd5c3bba2ce0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:25 2014 -0500 _alpm_resolvedeps: free targ inside loop Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fac9ac6c4011ff643b7335c7381f6219b07bba80 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:24 2014 -0500 sync_prepare: manually set pm_errno _alpm_resolvedeps resets pm_errno to 0 by calling alpm_checkdeps. Whenever the last call succeeded, pm_errno was not properly set, preventing pacman from properly handling the error and leaking additional memory. We know pm_errno should be ALPM_ERR_UNSATISFIED_DEPS if resolvedeps has failed, so just set it manually. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4d68092e2fd8c8a3b6da39e509ad48db0fc9ed7a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:23 2014 -0500 dump_pkg_full: fix optionalfor memory leak alpm_pkg_compute_optional returns a generated list that needs to be free'd. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6be08f76f6c4188f0aa4d0a4d88595a898bf3d3b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:22 2014 -0500 local_db_populate: initialize empty pkgcache If the db directory did not exist when local_db_populate was called, the pkgcache wouldn't be initialized, causing pkghash_add_pkg to fail. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 819b4cd54e3caec4d3803cc62772369031ed0847 Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Tue Jan 28 18:58:52 2014 +0100 Move NULL check before dereference Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 77da9dc9748b3f151f98c4c301e8da3a2551860d Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Tue Jan 28 17:50:44 2014 +0100 Another NULL check removed Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cb8eae24c9976c023c8ec2aff9bf305202edc4d7 Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Tue Jan 28 17:50:43 2014 +0100 Another unneeded NULL check removed Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d895cae16cc97e5f1e3f95eb748a99161678f8ee Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Tue Jan 28 17:50:42 2014 +0100 Remove unneeded NULL check Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aabb7c3cddf5e97d1b1ebb3548664f1af85c1392 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 28 21:40:37 2014 -0500 pacman: use exit status 0 for --help and --version The user requesting usage or version information is not an error. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7ae25ac67fd4dd087791be55fa3c4997be7aac52 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 28 21:37:00 2014 +1000 Consistently use 'directory' instead of 'folder' Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 333373f90e515bbaf6997dc7bf7385fe114689b2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jan 23 09:39:17 2014 -0500 enable_colors: always set color strings Only setting color strings when colors is true allowed subsequent calls to enable colors but not disable them. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 4 +- NEWS | 2 +- contrib/pacsearch.in | 114 +++++++++++++++++++++++------------------ doc/PKGBUILD.5.txt | 9 ++-- doc/makepkg.8.txt | 24 ++++----- doc/makepkg.conf.5.txt | 75 +++++++++++++-------------- lib/libalpm/be_local.c | 1 + lib/libalpm/deps.c | 3 +- lib/libalpm/sync.c | 3 +- proto/ChangeLog.proto | 16 ------ proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD-vcs.proto | 78 ++++++++++++++++++++++++++++ proto/PKGBUILD.proto | 2 +- scripts/library/README | 2 +- src/pacman/conf.c | 10 ++++ src/pacman/package.c | 1 + src/pacman/pacman.c | 22 ++++---- src/pacman/util.c | 22 ++++---- src/util/pacsort.c | 14 +++-- test/pacman/tests/pacman001.py | 2 +- test/pacman/tests/pacman002.py | 2 +- test/pacman/tests/pacman003.py | 2 +- 22 files changed, 252 insertions(+), 158 deletions(-) delete mode 100644 proto/ChangeLog.proto create mode 100644 proto/PKGBUILD-vcs.proto hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/7] Copyright year bump
by Pierre Neidhardt 02 Feb '14

02 Feb '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 624f201..63435f0 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -1,7 +1,7 @@ #!/usr/bin/perl # pacsearch - Adds color and install information to a 'pacman -Ss' search # -# Copyright (C) 2008-2011 Dan McGee <dan(a)archlinux.org> +# Copyright (C) 2008-2014 Dan McGee <dan(a)archlinux.org> # # Based off original shell script version: # Copyright (C) 2006-2007 Dan McGee <dan(a)archlinux.org> @@ -36,7 +36,7 @@ sub usage { sub version { printf "%s %s\n", $myname, $myver; - print "Copyright (C) 2008-2011 Dan McGee <dan\(a)archlinux.org>\n\n"; + print "Copyright (C) 2008-2014 Dan McGee <dan\(a)archlinux.org>\n\n"; print "Based off original shell script version:\n"; print "Copyright (C) 2006-2007 Dan McGee <dan\(a)archlinux.org>\n"; } -- 1.8.5.3

3 11

[pacman-dev] [PATCHv3] Remove ChangeLog.proto and move important info to PKGBUILD(5)
by Jason St. John 02 Feb '14

02 Feb '14

The change log prototype should be distribution determined. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This should fix the build errors found here: https://mailman.archlinux.org/pipermail/pacman-dev/2014-February/018671.html I tested this with 'make check' and 'make dist' in the PKGBUILD. Makefile.am | 3 +-- doc/PKGBUILD.5.txt | 1 + proto/ChangeLog.proto | 16 ---------------- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 proto/ChangeLog.proto diff --git a/Makefile.am b/Makefile.am index 1f79ba9..0ad8932 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,7 @@ pkgdatadir = ${datadir}/${PACKAGE} dist_pkgdata_DATA = \ proto/PKGBUILD.proto \ proto/PKGBUILD-split.proto \ - proto/proto.install \ - proto/ChangeLog.proto + proto/proto.install $(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py*) @printf "TESTS += %s\n" $^ | sed -e "s/\.py\.in/.py/" | LC_ALL=C sort -u > "$@" diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 6c5ef84..0638942 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -102,6 +102,7 @@ below). *changelog*:: Specifies a changelog file that is to be included in the package. + The changelog file should end in a single newline. 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`). diff --git a/proto/ChangeLog.proto b/proto/ChangeLog.proto deleted file mode 100644 index 87e86e7..0000000 --- a/proto/ChangeLog.proto +++ /dev/null @@ -1,16 +0,0 @@ -2007-12-01 Your Name <youremail(a)domain.com> - - * pkgver-pkgrel : - new upstream release. - Reason we changed stuff. - Another reason we changed stuff. - - * gcc-4.1.patch : - Removed, no longer needed. - -2007-11-01 Your Name <youremail(a)domain.com> - - * 1.0-5 : - added ChangeLog. - the last line should end with just one newline. - you can cat the file to check it displays fine. -- 1.8.5.3

1 0

[pacman-dev] [PATCHv3] makepkg.conf(5): Add missing backticks around vars, and use single quotes around "gpg" command
by Jason St. John 02 Feb '14

02 Feb '14

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- I'm leaving the "C++" bit untouched in this patch. doc/makepkg.conf.5.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ef64d17..af8aa30 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -78,7 +78,7 @@ Options Other flags that make accepts can also be passed. **DEBUG_CFLAGS=**"debug_cflags":: - Additional compiler flags appended to CFLAGS for use in debugging. Usually + Additional compiler flags appended to `CFLAGS` for use in debugging. Usually this would include: ``-g''. Read gcc(1) for more details on the wide variety of compiler flags available. @@ -115,8 +115,8 @@ Options makepkg's '\--check' and '\--nocheck' options respectively. *sign*;; - Generate a PGP signature file using GnuPG. This will execute `gpg - --detach-sign --use-agent` on the built package to generate a detached + Generate a PGP signature file using GnuPG. This will execute 'gpg + \--detach-sign \--use-agent' on the built package to generate a detached signature file, using the GPG agent if it is available. The signature file will be the entire filename of the package with a ``.sig'' extension. @@ -202,20 +202,20 @@ Options for details. **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: - If `zipman` is specified in the OPTIONS array, this variable will + If `zipman` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to compress manual (man and info) pages. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**:: - If `!docs` is specified in the OPTIONS array, this variable will + If `!docs` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to remove docs. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**:: - If `purge` is specified in the OPTIONS array, this variable will + If `purge` is specified in the `OPTIONS` array, this variable will instruct makepkg which files to remove from the package. This is useful for index files that are added by multiple packages. -- 1.8.5.3

1 0

[pacman-dev] [PATCHv2 1/2] makepkg.conf(5): Add missing backticks around vars, and use single quotes around "gpg" command
by Jason St. John 02 Feb '14

02 Feb '14

Escape the first '+' character in "C++" to fix Vim syntax highlighting. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmission based on Dan's feedback here: https://mailman.archlinux.org/pipermail/pacman-dev/2014-January/018605.html doc/makepkg.conf.5.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ef64d17..0f3eb88 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -78,7 +78,7 @@ Options Other flags that make accepts can also be passed. **DEBUG_CFLAGS=**"debug_cflags":: - Additional compiler flags appended to CFLAGS for use in debugging. Usually + Additional compiler flags appended to `CFLAGS` for use in debugging. Usually this would include: ``-g''. Read gcc(1) for more details on the wide variety of compiler flags available. @@ -96,7 +96,7 @@ Options Allow building packages as a non-root user. This is highly recommended. *distcc*;; - Use the distributed C/C++/ObjC compiler to spread compilation among + Use the distributed C/C\++/ObjC compiler to spread compilation among multiple machines. If this is enabled, `DISTCC_HOSTS` must be specified as well. @@ -115,8 +115,8 @@ Options makepkg's '\--check' and '\--nocheck' options respectively. *sign*;; - Generate a PGP signature file using GnuPG. This will execute `gpg - --detach-sign --use-agent` on the built package to generate a detached + Generate a PGP signature file using GnuPG. This will execute 'gpg + \--detach-sign \--use-agent' on the built package to generate a detached signature file, using the GPG agent if it is available. The signature file will be the entire filename of the package with a ``.sig'' extension. @@ -202,20 +202,20 @@ Options for details. **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: - If `zipman` is specified in the OPTIONS array, this variable will + If `zipman` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to compress manual (man and info) pages. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**:: - If `!docs` is specified in the OPTIONS array, this variable will + If `!docs` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to remove docs. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**:: - If `purge` is specified in the OPTIONS array, this variable will + If `purge` is specified in the `OPTIONS` array, this variable will instruct makepkg which files to remove from the package. This is useful for index files that are added by multiple packages. -- 1.8.5.3

2 3

[pacman-dev] [PATCHv2 1/2] proto: Remove recommendation of "makepkg -g" in comments
by Jason St. John 02 Feb '14

02 Feb '14

This recommendation encouraged the practice of not checking the checksums provided upstream. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmission based on Allan's feedback here: https://mailman.archlinux.org/pipermail/pacman-dev/2014-January/018570.html proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index d0978d7..dd73f93 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -28,7 +28,7 @@ changelog= source=("$pkgbase-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() prepare() { cd "$pkgname-$pkgver" diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 8d26c81..12816e0 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() prepare() { cd "$pkgname-$pkgver" -- 1.8.5.3

2 2

[pacman-dev] [PATCH 1/3] makepkg.conf(5): Add missing backticks around vars, and use single quotes around "gpg" command
by Jason St. John 01 Feb '14

01 Feb '14

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- I left some of the references to CFLAGS, etc. without backticks because they are references to sections within the man page rather than about the literal variables themselves. I added backticks around "C/C++/ObjC" to prevent any possible confusion by AsciiDoc, as plus signs are parsed as AsciiDoc quotes. This apparently confused Vim's syntax highlighting, which is why I noticed it. doc/makepkg.conf.5.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ef64d17..e43368c 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -78,7 +78,7 @@ Options Other flags that make accepts can also be passed. **DEBUG_CFLAGS=**"debug_cflags":: - Additional compiler flags appended to CFLAGS for use in debugging. Usually + Additional compiler flags appended to `CFLAGS` for use in debugging. Usually this would include: ``-g''. Read gcc(1) for more details on the wide variety of compiler flags available. @@ -96,7 +96,7 @@ Options Allow building packages as a non-root user. This is highly recommended. *distcc*;; - Use the distributed C/C++/ObjC compiler to spread compilation among + Use the distributed `C/C++/ObjC` compiler to spread compilation among multiple machines. If this is enabled, `DISTCC_HOSTS` must be specified as well. @@ -115,8 +115,8 @@ Options makepkg's '\--check' and '\--nocheck' options respectively. *sign*;; - Generate a PGP signature file using GnuPG. This will execute `gpg - --detach-sign --use-agent` on the built package to generate a detached + Generate a PGP signature file using GnuPG. This will execute 'gpg + \--detach-sign \--use-agent' on the built package to generate a detached signature file, using the GPG agent if it is available. The signature file will be the entire filename of the package with a ``.sig'' extension. @@ -202,20 +202,20 @@ Options for details. **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: - If `zipman` is specified in the OPTIONS array, this variable will + If `zipman` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to compress manual (man and info) pages. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**:: - If `!docs` is specified in the OPTIONS array, this variable will + If `!docs` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to remove docs. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**:: - If `purge` is specified in the OPTIONS array, this variable will + If `purge` is specified in the `OPTIONS` array, this variable will instruct makepkg which files to remove from the package. This is useful for index files that are added by multiple packages. -- 1.8.5.3

4 7

[pacman-dev] [PATCH] Add PKGBUILD-vcs.proto
by Maxime Gauduin 30 Jan '14

30 Jan '14

Add a proto for bzr, git, hg and svn PKGBUILDs and remove the corresponding protos from abs. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- proto/PKGBUILD-vcs.proto | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 proto/PKGBUILD-vcs.proto diff --git a/proto/PKGBUILD-vcs.proto b/proto/PKGBUILD-vcs.proto new file mode 100644 index 0000000..3aa7890 --- /dev/null +++ b/proto/PKGBUILD-vcs.proto @@ -0,0 +1,95 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# The following guidelines are specific to BZR, GIT, HG and SVN packages. +# CVS and DARCS are not natively supported in pacman yet, please refer to the +# dedicated prototypes instead. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME-VCS # '-bzr', '-git', '-hg' or '-svn' +pkgver=VERSION +pkgrel=1 +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=('VCS_PACKAGE') # 'bzr', 'git', 'mercurial' or 'subversion' +provides=("${pkgname%-VCS}") +conflicts=("${pkgname%-VCS}") +replaces=() +backup=() +options=() +install= +source=('DIR_NAME::VCS+REPO_URL#FRAGMENT') +noextract=() +md5sums=('SKIP') + +################################################################################ + +# DIR_NAME: Use to change the source directory name if needed + +# VCS: Use to specify the VCS type, not needed when REPO_URL is explicit (for +# example git://URL, svn://URL or lp:REPO_NAME) + +# FRAGMENT: Use to pull a specific branch, commit/revision or tag +# Bazaar accepts the 'revision' keyword +# Git accepts the 'branch', 'commit' and 'tag' keywords +# Mercurial accepts the 'branch', 'revision' and 'tag' keywords +# Subversion accepts the 'revision' keyword + +# Examples: +# source=("lp:${pkgname%-bzr}#revision=42") +# source=("git+https://github.com/author/${pkgname%-git}.git#branch=unstable") +# source=('hg+https://bitbucket.org/author/project#tag=2.0') +# source=("${pkgname%-svn}::svn://svn.code.sf.net/p/project/code/trunk"} + +################################################################################ + +pkgver() { + cd "$srcdir/${pkgname%-VCS}" + +# The examples below are not absolute and need to be adapted to each repo. The +# general idea is to have VERSION='VER_NUM.rREV_NUM.HASH' or any subset in case +# VER_NUM or HASH are not available. + +# Bazaar + printf "r%s" "$(bzr revno)" + +# Git, tags available + printf "%s" "$(git describe --long | sed 's/$[^-]*-$g/r\1/;s/-/./g')" + +# Git, no tags available + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + +# Mercurial + printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)" + +# Subversion + printf "r%s" "$(svnversion | tr -d 'A-z')" +} + +prepare() { + cd "$srcdir/${pkgname%-VCS}" + patch -p1 -i "$srcdir/${pkgname%-VCS}.patch" +} + +build() { + cd "$srcdir/${pkgname%-VCS}" + ./autogen.sh + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/${pkgname%-VCS}" + make -k check +} + +package() { + cd "$srcdir/${pkgname%-VCS}" + make DESTDIR="$pkgdir/" install +} -- 1.8.5.3

2 7