- Pacman-dev - lists.archlinux.org

[pacman-dev] Adding .pacold files to aid with .pacnew merging
by Clemens Buchacher 01 Jul '12

01 Jul '12

Hi, As is nicely described here [1], .pacnew files are created if the new version differs from both the old version, and the user modified version. User intervention is required to resolve the conflict. Since the user modified the file themselves, one might think that they would have no trouble resolving that conflict. However, in my experience it is sometimes not as trivial as it should be. For example, just recently /etc/group.pacnew was created due to an upgrade of 'filesystem'. This was the output of diff group group.pacnew for me: 8c8 < lp:x:7:daemon,drizzd --- > lp:x:7:daemon 11c11 < wheel:x:10:root,drizzd --- > wheel:x:10:root 15c15 < log:x:19:root,drizzd --- > log:x:19:root 21,25c21,26 < games:x:50:drizzd < network:x:90:drizzd < video:x:91:drizzd < audio:x:92:drizzd,mpd < optical:x:93:drizzd --- > games:x:50: > lock:x:54: > network:x:90: > video:x:91: > audio:x:92: > optical:x:93: 27,29c28,30 < storage:x:95:drizzd < scanner:x:96:drizzd < power:x:98:drizzd --- > storage:x:95: > scanner:x:96: > power:x:98: 32,50d32 < dbus:x:81: < avahi:x:84: < rtkit:x:133: < gdm:x:120: < postgres:x:88: < postfix:x:73: < nm-openconnect:x:104: < postdrop:x:75: < networkmanager:x:1000:drizzd < usbmux:x:140: < mpd:x:45: < vboxusers:x:108: < lpadmin:x:1001:drizzd < munin:x:999: < adbusers:x:1002:drizzd < lock:x:54: < ntp:x:87: < lxdm:x:1003: Ok, so I added myself to several groups. Those are easily eliminated. But what about this large number of groups at the end, which seem to be gone in the new version? I didn't add them manually, but surely some of those are still needed. With help of some version control history I found out that the 'lock' group was added, but /etc/group was immediately updated by the install script, and therefore the .pacnew file was redundant. Long story short, this could have gone much more smoothly if a .pacold file (corresponding to the original file from the old package version) had been provided alongside the .pacnew file. Diffing old vs. new would show the single-line change, making it obvious what to do: nothing. So much for the motivation. As for the feasibility, I've done some research. On my system, I currently have in total of: 1037 packages 406 backup files 2.7M of disk space used by backup files 408K of disk space used by tar.gz'd backup files 25M of disk space used by /var/lib/pacman/local Currently, the local db stores only hashes of the installed backup files, but not the actual contents. Judging from the example above, storing the contents of the backup files would add only 2.7M to currently 25M. Compression can be used to reduce the overhead further. I have not worked on pacman before, but if the concept sounds good to you, I will try to implement this. As a future improvement, once .pacold files are available, pacnew merge tools could also be taught to use three-way merge. Clemens [1] https://wiki.archlinux.org/index.php/Pacnew_and_Pacsave_Files#.pacnew

1 0

[pacman-dev] [PATCH] signing.c: warn if time went backwards
by Florian Pritz 01 Jul '12

01 Jul '12

GPG signatures have a timestamp which is checked and if it's in the future, verification will fail. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Allan suggested to improve the error message printed when verification fails, but since I already have this patch I can just as well submit it. lib/libalpm/signing.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 1e41716..6148976 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -20,6 +20,8 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <time.h> +#include <errno.h> #if HAVE_LIBGPGME #include <locale.h> /* setlocale() */ @@ -127,6 +129,10 @@ static int init_gpgme(alpm_handle_t *handle) gpgme_error_t err; gpgme_engine_info_t enginfo; + const static char *timestamp_file = "timestamp"; + int len; + char *timestamp_path; + if(init) { /* we already successfully initialized the library */ return 0; @@ -143,6 +149,34 @@ static int init_gpgme(alpm_handle_t *handle) "pacman-key --init"); } + len = strlen(sigdir) + strlen(timestamp_file) + 1; + CALLOC(timestamp_path, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(timestamp_path, len, "%s%s", sigdir, timestamp_file); + + /* check if time went backwards since last run */ + if(!_alpm_access(handle, sigdir, timestamp_file, F_OK)) { + struct stat sb; + time_t t; + + if(stat(timestamp_path, &sb) == -1) { + /* TODO: should we really error here? */ + RET_ERR(handle, ALPM_ERR_SYSTEM, -1); + } + + t = time(NULL); + if(t == ((time_t)-1)) { + _alpm_log(handle, ALPM_LOG_ERROR, _("Failed to determine system time: %s\n"), strerror(errno)); + } + + if(sb.st_mtime > t) { + _alpm_log(handle, ALPM_LOG_WARNING, _("Time went backwards, signature verification might fail.\n")); + } + } + /* create file if missing, else update timestamp */ + close(creat(timestamp_path, O_RDWR)); + + free(timestamp_path); + /* calling gpgme_check_version() returns the current version and runs * some internal library setup code */ version = gpgme_check_version(NULL); -- 1.7.11.1

2 1

[pacman-dev] [PATCH] Add docs for pactree
by rambham＠gmail.com 29 Jun '12

29 Jun '12

From: Ram Bhamidipaty <rambham(a)gmail.com> Patch to add docs for the pactree utility. This version includes feedback from Allan McRae and Andrew Gregory. Also removed duplicate entries for -c. Signed-off-by: Ram Bhamidipaty <rambham(a)gmail.com> --- doc/.gitignore | 1 + doc/Makefile.am | 8 +++++-- doc/pactree.8.txt | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 doc/pactree.8.txt diff --git a/doc/.gitignore b/doc/.gitignore index 5625735..a96ddb3 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -5,6 +5,7 @@ makepkg.conf.5 pacman.8 pacman-key.8 pacman.conf.5 +pactree.8 pkgdelta.8 repo-add.8 repo-remove.8 diff --git a/doc/Makefile.am b/doc/Makefile.am index e6ed29c..2c08de5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -13,7 +13,8 @@ ASCIIDOC_MANS = \ PKGBUILD.5 \ makepkg.conf.5 \ pacman.conf.5 \ - libalpm.3 + libalpm.3 \ + pactree.8 DOXYGEN_MANS = $(wildcard man3/*.3) @@ -27,7 +28,8 @@ HTML_MANPAGES = \ PKGBUILD.5.html \ makepkg.conf.5.html \ pacman.conf.5.html \ - libalpm.3.html + libalpm.3.html \ + pactree.8.html HTML_OTHER = \ index.html \ @@ -53,6 +55,7 @@ EXTRA_DIST = \ makepkg.conf.5.txt \ pacman.conf.5.txt \ libalpm.3.txt \ + pactree.8.txt \ footer.txt \ index.txt \ submitting-patches.txt \ @@ -152,6 +155,7 @@ PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.txt PKGBUILD-example.txt makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.txt pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt libalpm.3 libalpm.3.html: libalpm.3.txt +pactree.8 pactree.8.html: pactree.8.txt # this one is just a symlink repo-remove.8: repo-add.8 $(RM) repo-remove.8 diff --git a/doc/pactree.8.txt b/doc/pactree.8.txt new file mode 100644 index 0000000..0cba7b5 --- /dev/null +++ b/doc/pactree.8.txt @@ -0,0 +1,62 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +pactree(8) +========= + +Name +---- +pactree - package dependency tree viewer + + +Synopsis +-------- +'pactree' [options] package + +Description +----------- +Pactree produces a dependency tree for a package. + +By default a tree like output is generated, but with the -g option a graphviz +description is generated. + +Options +------- +*-c, \--color*:: + Colorize output. + +*-b, \--dbpath*:: + Specify an alternative database location. + +*-d, \--depth <num>*:: + Limits the number of levels of dependency to show. A zero means + show the named package only, one shows the packages that are directly + required. + +*-g, \--graph*:: + Generate graphviz description. If this option is given, the -c and -l + options are ignored. + +*-h, \--help*:: + Output syntax and command line options. + +*-l, \--linear*:: + Prints package names at the start of each line, one per line. + +*-r, \--reverse*:: + Show packages that depend on the named package. + +*-s, \--sync*:: + Read package data from sync databases instead of local database. + +*-u, \--unique*:: + List dependent packages once. Implies --linear. + +*\--config <file>*:: + Specify an alternate pacman configuration file. + +See Also +-------- +linkman:pacman[8], linkman:pacman.conf[5], linkman:makepkg[8] + +include::footer.txt[] -- 1.7.11

2 1

[pacman-dev] [PATCH 10/11] makepkg: provide mechanism for auto-updating pkgver
by Allan McRae 29 Jun '12

29 Jun '12

Now that VCS repos are provided in the source array, it becomes too complicated to have automatic updating pkgver as was the case with the old VCS PKGBUILDs (there can be multiple repos of different types in the source array, the VCS repo may not be the package primary source, etc). Instead provide an optional way for a PKGBUILD to update the pkgver value through the specifing of a pkgver() function that returns the new version string. This is run after all source files are downloaded so can access the VCS repo if needed. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0b282a5..5cc378d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -471,9 +471,30 @@ download_sources() { esac done + if declare -f pkgver >/dev/null; then + update_pkgver + fi + popd &>/dev/null } +# Automatically update pkgver variable if a pkgver() function is provided +# Re-sources the PKGBUILD afterwards to allow for other variables that use $pkgver +update_pkgver() { + newpkgver=$(pkgver) + + if [[ -n $newpkgver && $newpkgver != "$pkgver" ]]; then + if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then + @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" + @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" + source "$BUILDFILE" + else + warning "$(gettext "%s is not writeable -- pkgver will not be updated")" \ + "$BUILDFILE" + fi + fi +} + # Print 'source not found' error message and exit makepkg missing_source_file() { error "$(gettext "Unable to find source file %s.")" "$(get_filename "$1")" -- 1.7.11.1

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-305-g0c62b36
by dan＠archlinux.org 26 Jun '12

26 Jun '12

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 0c62b36c19d67939d7a84159c86a5de73fd9d36f (commit) via 47711947ddf95032334fbe9dd912cbd8d146e174 (commit) via b1bb2eaa50e436e2221a1aec9749de58e4234b44 (commit) via a98fce08968febe7395b30f15f070f400da089ed (commit) via ab8431c92953c4562af214e5170f8ef321037108 (commit) via b58489d29a1898a4bff1b5da6ca4bfb14003dbfe (commit) via e183522e3168c4a31103b3c7910fa8d29333fb5a (commit) via 82c999a8bfbffab4740742b4746435f5f1657643 (commit) from 377cc23a09f7605e1f14ab89933f4d7dc69bc2cf (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 0c62b36c19d67939d7a84159c86a5de73fd9d36f Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 19 23:36:30 2012 +1000 Allow leading "local/" in query operations I find that when copying the output of "pacman -Qs foo" into a "pacman -Qi" operation to get more information on the packages, I consistently copy the "local/" prefix. It is a minor usability improvement to strip this if present. Dan: Pluck out LOCAL_PREFIX and magic numbers. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 47711947ddf95032334fbe9dd912cbd8d146e174 Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 8 23:32:43 2012 +1000 Scripts testsuite output consistency Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b1bb2eaa50e436e2221a1aec9749de58e4234b44 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun May 6 19:47:47 2012 -0400 paccache: adopt size_to_human Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a98fce08968febe7395b30f15f070f400da089ed Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun May 6 18:27:43 2012 -0400 scripts/library: add size_to_human This function is the reverse of human_to_size, and converts integer byte sizes to human readable SI prefixed values. A logical extension of this might be to mimic the formatter that pacman uses and allow a second argument to be passed in which can coerce the size, rather than reducing until the unit count is below 1024. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ab8431c92953c4562af214e5170f8ef321037108 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Apr 25 22:28:39 2012 -0400 pkgdelta: use human_to_size to parse --min-pkg-size Update the documentation accordingly to mention that users can expect huamn readable sizes to be acceptable. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit b58489d29a1898a4bff1b5da6ca4bfb14003dbfe Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Apr 25 22:27:19 2012 -0400 scripts/library: add human_to_size This is a bash wrapper around an awk function that parses human readable sizes and returns their representative values in bytes, as a string. A small test harness is added to validate the functionality. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e183522e3168c4a31103b3c7910fa8d29333fb5a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 29 15:00:38 2012 -0400 diskspace: only load filesystem info on demand Only load filesystem details for the mount points that we're actually going to write to. This reduces our syscall count considerably. In the case of installation, we would actually stat every mountpoint twice (an extra round for download diskspace) which means (on my system) a total of 60 syscalls to write to 3 partitions when installing the kernel package. This change reduces the 60 syscalls down to the expected 3. A slight debug output change is added here to discern between a mountpoint added to our linked list versus when we actually load the fs info. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 82c999a8bfbffab4740742b4746435f5f1657643 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 29 14:54:10 2012 -0400 diskspace: dedupe code for loading FS usage add mount_point_load_fsinfo() for platforms using getmntent(). Dan: move the #ifdef slightly so we don't have unused functions on certain platforms (e.g., OS X). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 + contrib/Makefile.am | 2 +- contrib/paccache.sh.in | 21 +--------- doc/pkgdelta.8.txt | 3 +- lib/libalpm/diskspace.c | 81 ++++++++++++++++++++++++------------ lib/libalpm/diskspace.h | 7 ++++ scripts/Makefile.am | 4 +- scripts/library/README | 12 ++++++ scripts/library/human_to_size.sh | 51 +++++++++++++++++++++++ scripts/library/size_to_human.sh | 22 ++++++++++ scripts/pkgdelta.sh.in | 13 +++--- src/pacman/query.c | 9 +++- test/scripts/Makefile.am | 3 +- test/scripts/human_to_size_test.sh | 75 +++++++++++++++++++++++++++++++++ test/scripts/parseopts_test.sh | 4 +- 15 files changed, 250 insertions(+), 59 deletions(-) create mode 100644 scripts/library/human_to_size.sh create mode 100644 scripts/library/size_to_human.sh create mode 100644 test/scripts/human_to_size_test.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-297-g377cc23
by dan＠archlinux.org 26 Jun '12

26 Jun '12

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 377cc23a09f7605e1f14ab89933f4d7dc69bc2cf (commit) via 12866ba791f1a9ae17d27574b66e4797b8b86144 (commit) via 5951e9ce84a30cc29ba9b46ebb10cb2561581e8d (commit) via e253968b4df079faf91266639be1b8b2cff6e2b5 (commit) via 81dd6ddf0cdd4034771828529c65d61e5bc94e5d (commit) via d310b6f85cd664a45a19d74678b0a4abeb3c5e25 (commit) via 3a24e44206c38577ef4405bf66583e2084688e5c (commit) via 19c2347507fc0847572e30edd25809f5bc9a9ffb (commit) via da0dcc29cf038de7dee9b16987b508e45d56ae91 (commit) via c6e47cb435988494f978c603eb12db97cfc88b3e (commit) via 9f751bf49247ff94b8ad8b808aee0527e9733a41 (commit) via f556fe8b4a199116b5665bb5f0886e4c2962b077 (commit) via 74274b5dc347ba70e4abd1f329feb41538f82ff4 (commit) via 7245bc8e8e01149e076e820ea251f23839b1e0b2 (commit) via 6a5370b634c6b01b5c76c9577e1ca4007dbcc8bd (commit) via 1d32934769ebcf0ad32f0b8e8356e5fb0c7b8b2c (commit) via 9ce4f80db4cccfe16c4a747b8bf3185b48e8aefc (commit) via ac990b96e7d305e0f20f00601f2172879faac9a1 (commit) via a64a8d6cea828c7ef517986653e174154f3d94fd (commit) from 9a76a458b898ea462666491cb74cd95372462da4 (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 377cc23a09f7605e1f14ab89933f4d7dc69bc2cf Author: Daniel Wallace <daniel.wallace(a)gatech.edu> Date: Tue Jun 19 19:03:58 2012 -0400 zsh-completion: Allow use of names in pacman-key With pacman-key now having the ability to use names in --list-keys etc, we can remove the comments that temporarily blocked this in the zsh completion file. Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 12866ba791f1a9ae17d27574b66e4797b8b86144 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Fri Jun 15 23:37:00 2012 -0400 Added syntax highlighting for the sha256sums, sha384sums, and sha512sums arrays Fixed FS#29213 Signed-off-by: Jason St. John <jstjohn .. purdue . edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5951e9ce84a30cc29ba9b46ebb10cb2561581e8d Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jun 8 11:16:45 2012 +1000 contrib: fix typo in PKGBUILD.vim FS#30156 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e253968b4df079faf91266639be1b8b2cff6e2b5 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 7 16:21:05 2012 +1000 repo-add: add checkdepends information Similar to the case for makedepends, it is useful to be able to access this information without parsing a PKGBUILD. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 81dd6ddf0cdd4034771828529c65d61e5bc94e5d Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 7 16:09:46 2012 +1000 makepkg: install deps with --repackage I have noticed that quite a number of packages fail with "makepkg -R" when their (make)dependencies are not installed. Adjust makepkg to check for dependencies when used with -R. This can still be avoided by using --nodeps/-d. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d310b6f85cd664a45a19d74678b0a4abeb3c5e25 Author: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Date: Mon May 28 16:13:35 2012 +0000 Allow wildcards in PURGE_TARGETS to match any type of file except for directories. Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> commit 3a24e44206c38577ef4405bf66583e2084688e5c Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 2 23:36:16 2012 +1000 makepkg: allow url to be overridden in split packages This is already being used (despite not working...) in packages in the Arch Linux repos. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19c2347507fc0847572e30edd25809f5bc9a9ffb Author: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Date: Wed May 23 03:18:42 2012 +0000 Portability fixes for makepkg Allow makepkg to work correctly when used with find from busybox. Fix handling of cross directory symlinks. Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit da0dcc29cf038de7dee9b16987b508e45d56ae91 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jun 20 16:18:42 2012 -0400 query: avoid false ownership matches for files in root Check for an exact match when querying ownership of files in the root. Previously, our test was too simple and would match the the basename of package files against the query parameter, e.g. $ pacman -Qo config /config is owned by cower-git 20120614-1 Adds a new test to verify this behavior, query007.py. Fixes FS#30388. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c6e47cb435988494f978c603eb12db97cfc88b3e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 10 12:19:07 2012 -0400 updpkgsums: avoid fancy quoting in error message m4 has a field day parsing escapes and actually vandalizes this string, causing the error to look like: ==> ERROR: \PKGBUILD\ not found or is not a file Avoid all quoting and just match up with how makepkg reports errors (no quoting at all). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f751bf49247ff94b8ad8b808aee0527e9733a41 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jun 8 18:27:34 2012 -0400 contrib: sed out @SCRIPTNAME@ in edit command Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f556fe8b4a199116b5665bb5f0886e4c2962b077 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon May 28 17:32:11 2012 -0400 add line length parameter to _alpm_strip_newline If known, callers can pass the line size to this function in order to avoid an strlen call. Otherwise, they simply pass 0 and _alpm_strip_newline will do the call instead. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 74274b5dc347ba70e4abd1f329feb41538f82ff4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon May 28 17:30:08 2012 -0400 add real_line_size to alpm_read_buffer We inevitably call strlen() or similar on the line returned from _alpm_archive_fgets(), so include the line size of the interesting line in the struct. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7245bc8e8e01149e076e820ea251f23839b1e0b2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 7 06:01:03 2012 -0400 pkgdelta: add missing --version longopt This was missed in the switch to parseopts, and was caught by distcheck. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6a5370b634c6b01b5c76c9577e1ca4007dbcc8bd Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jun 5 19:15:59 2012 -0400 check proper variable for NULL Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d32934769ebcf0ad32f0b8e8356e5fb0c7b8b2c Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 7 14:23:06 2012 +1000 Create repo-remove symlink in scripts dir Fix the creation of the repo-remove symlink in the scripts/ dir on building. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9ce4f80db4cccfe16c4a747b8bf3185b48e8aefc Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 29 18:26:13 2012 -0400 diskspace: canonicalize path to download dir With lazy loading in place, it's now quite obvious that we aren't necessarily checking the right mountpoint for necessary download space. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ac990b96e7d305e0f20f00601f2172879faac9a1 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon May 21 04:30:19 2012 +0000 libalpm/remove.c - add doxygen Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a64a8d6cea828c7ef517986653e174154f3d94fd Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue May 15 20:53:47 2012 -0400 paccache: allow running as root The main motivation for this change is to allow this to be run as a cron job. Satisfies FS#29897 and some other undocumented requests for this. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 +++ contrib/Makefile.am | 1 + contrib/PKGBUILD.vim | 48 ++++++++++++++++++++-- contrib/paccache.sh.in | 7 +--- contrib/updpkgsums.sh.in | 2 +- contrib/zsh_completion.in | 9 ++--- doc/PKGBUILD.5.txt | 6 +-- lib/libalpm/be_local.c | 14 +++---- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 14 +++++-- lib/libalpm/diskspace.c | 10 ++++- lib/libalpm/remove.c | 89 +++++++++++++++++++++++++++++++++++++++-- lib/libalpm/util.c | 12 +++--- lib/libalpm/util.h | 3 +- proto/PKGBUILD-split.proto | 1 + scripts/Makefile.am | 13 +++--- scripts/makepkg.sh.in | 80 +++++++++++++++++------------------- scripts/pkgdelta.sh.in | 2 +- scripts/repo-add.sh.in | 4 +- src/pacman/query.c | 6 ++- test/pacman/tests/query007.py | 11 +++++ 21 files changed, 247 insertions(+), 92 deletions(-) create mode 100644 test/pacman/tests/query007.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] add man page for pactree
by rambham＠gmail.com 25 Jun '12

25 Jun '12

From: Ram Bhamidipaty <rambham(a)gmail.com> Signed-off-by: Ram Bhamidipaty <rambham(a)gmail.com> --- doc/Makefile.am | 8 +++++-- doc/pactree.8.txt | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 doc/pactree.8.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index e6ed29c..2c08de5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -13,7 +13,8 @@ ASCIIDOC_MANS = \ PKGBUILD.5 \ makepkg.conf.5 \ pacman.conf.5 \ - libalpm.3 + libalpm.3 \ + pactree.8 DOXYGEN_MANS = $(wildcard man3/*.3) @@ -27,7 +28,8 @@ HTML_MANPAGES = \ PKGBUILD.5.html \ makepkg.conf.5.html \ pacman.conf.5.html \ - libalpm.3.html + libalpm.3.html \ + pactree.8.html HTML_OTHER = \ index.html \ @@ -53,6 +55,7 @@ EXTRA_DIST = \ makepkg.conf.5.txt \ pacman.conf.5.txt \ libalpm.3.txt \ + pactree.8.txt \ footer.txt \ index.txt \ submitting-patches.txt \ @@ -152,6 +155,7 @@ PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.txt PKGBUILD-example.txt makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.txt pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt libalpm.3 libalpm.3.html: libalpm.3.txt +pactree.8 pactree.8.html: pactree.8.txt # this one is just a symlink repo-remove.8: repo-add.8 $(RM) repo-remove.8 diff --git a/doc/pactree.8.txt b/doc/pactree.8.txt new file mode 100644 index 0000000..47dba30 --- /dev/null +++ b/doc/pactree.8.txt @@ -0,0 +1,64 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +pactree(8) +========= + +Name +---- +pactree - package dependency tree viewer + + +Synopsis +-------- +'pactree' [options] package + +Description +----------- +Pactree produces a dependency tree for a package. The reverse can also +be shown - packages that depend on the named package. + +By default a tree like output is generated, but with the -g option a graphviz +description is generated. + +Options +------- +*-c, \--color*:: + Colorize output. + +*-d, \--depth <num>*:: + Limits the number of levels of dependency to show. A zero means + show the named package only, one shows the packages that are directly + required. + +*-g, \--graph*:: + Generate graphviz description. If this option is given the -c and -l + options are ignored. + +*-h, \--help*:: + Display brief usage message and exit. + +*-l, \--linear*:: + Prints package names at the start of each line, one per line. + +*-r, \--reverse*:: + Show packages that depend on the named package. + +*-s, \--sync*:: + Read package data from sync databases instead of local database. + +*-u, \--unique*:: + List dependent packages once, also implies --linear. + +*-c, \--color*:: + Use color in the output. This is done using escape codes that + should be understood by most terminal emulators. + +*\--config <file>*:: + Specify an alternate configuration file. + +See Also +-------- +linkman:pacman[8], linkman:pacman.conf[5], linkman:makepkg[8] + +include::footer.txt[] -- 1.7.11

2 1

[pacman-dev] [PATCH] add man page for pactree
by rambham＠gmail.com 21 Jun '12

21 Jun '12

From: Ram Bhamidipaty <rambham(a)gmail.com> Signed-off-by: Ram Bhamidipaty <rambham(a)gmail.com> --- doc/Makefile.am | 8 +++++-- doc/pactree.8.txt | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 doc/pactree.8.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index e6ed29c..2c08de5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -13,7 +13,8 @@ ASCIIDOC_MANS = \ PKGBUILD.5 \ makepkg.conf.5 \ pacman.conf.5 \ - libalpm.3 + libalpm.3 \ + pactree.8 DOXYGEN_MANS = $(wildcard man3/*.3) @@ -27,7 +28,8 @@ HTML_MANPAGES = \ PKGBUILD.5.html \ makepkg.conf.5.html \ pacman.conf.5.html \ - libalpm.3.html + libalpm.3.html \ + pactree.8.html HTML_OTHER = \ index.html \ @@ -53,6 +55,7 @@ EXTRA_DIST = \ makepkg.conf.5.txt \ pacman.conf.5.txt \ libalpm.3.txt \ + pactree.8.txt \ footer.txt \ index.txt \ submitting-patches.txt \ @@ -152,6 +155,7 @@ PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.txt PKGBUILD-example.txt makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.txt pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt libalpm.3 libalpm.3.html: libalpm.3.txt +pactree.8 pactree.8.html: pactree.8.txt # this one is just a symlink repo-remove.8: repo-add.8 $(RM) repo-remove.8 diff --git a/doc/pactree.8.txt b/doc/pactree.8.txt new file mode 100644 index 0000000..d7a5b4a --- /dev/null +++ b/doc/pactree.8.txt @@ -0,0 +1,64 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +pacman(8) +========= + +Name +---- +pactree - package dependency tree viewer + + +Synopsis +-------- +'pactree' [options] package + +Description +----------- +Pactree produces a dependency tree for a package. The reverse can also +be shown - packages that depend on the named package. + +By default a tree like output is generated, but with the -g option a graphviz +description is generated. + +Options +------- +*-c, \--color*:: + Colorize output. + +*-d, \--depth <num>*:: + Limits the number of levels of dependancy to show. A zero means + show the named package only, one shows the packages that are directly + required. + +*-g, \--graph*:: + Generate graphviz desciption. If this option is given the -c and -l + options are ignored. + +*-h, \--help*:: + Display brief usage message and exit. + +*-l, \--linear*:: + Prints package names at the start of each line, one per line. + +*-r, \--reverse*:: + Show packages that depend on the named package. + +*-s, \--sync*:: + Read package data from sync databases instead of local database. + +*-u, \--unique*:: + List dependent packages once. + +*-c, \--color*:: + Use color in the output. This is done using escape codes that + should be understood by most terminal emulators. + +*\--config <file>*:: + Specify an alternate configuration file. + +See Also +-------- +linkman:pacman[8], linkman:pacman.conf[5], linkman:makepkg[8] + +include::footer.txt[] -- 1.7.11

2 1

[pacman-dev] [PATCH] query: avoid false ownership matches for files in root
by Dave Reisner 21 Jun '12

21 Jun '12

Check for an exact match when querying ownership of files in the root. Previously, our test was too simple and would match the the basename of package files against the query parameter, e.g. $ pacman -Qo config /config is owned by cower-git 20120614-1 Adds a new test to verify this behavior, query007.py. Fixes FS#30388. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- src/pacman/query.c | 7 +++++-- test/pacman/tests/query007.py | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 test/pacman/tests/query007.py diff --git a/src/pacman/query.c b/src/pacman/query.c index a1cc1cf..a7e93c5 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -190,6 +190,7 @@ static int query_fileowner(alpm_list_t *targets) } free(dname); + for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { alpm_pkg_t *info = i->data; alpm_filelist_t *filelist = alpm_pkg_get_files(info); @@ -207,8 +208,10 @@ static int query_fileowner(alpm_list_t *targets) /* for files in '/', there is no directory name to match */ if(!rpath) { - print_query_fileowner(filename, info); - found = 1; + if(strcmp(pkgfile, bname) == 0) { + print_query_fileowner(filename, info); + found = 1; + } continue; } diff --git a/test/pacman/tests/query007.py b/test/pacman/tests/query007.py new file mode 100644 index 0000000..35bb0ca --- /dev/null +++ b/test/pacman/tests/query007.py @@ -0,0 +1,11 @@ +self.description = "Query ownership of file in root" + +sp = pmpkg("dummy") +sp.files = ["etc/config"] +self.addpkg2db("local", sp) + +self.filesystem = ["config"] + +self.args = "-Qo /config" + +self.addrule("PACMAN_RETCODE=1") -- 1.7.11

3 2

[pacman-dev] man page for pactree ?
by Ram Bhamidipaty 20 Jun '12

20 Jun '12

Hi, I am interested in creating a man page pactree. Assuming that I can produce something of acceptable quality - is this something that is likely to be accepted and merged into some up coming release? -Ram

2 1

[pacman-dev] [PATCH] makepkg: fix log file names for arch=any packages
by Florian Pritz 20 Jun '12

20 Jun '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/makepkg.sh.in | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 718b4e9..9a41417 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -151,18 +151,23 @@ clean_up() { rm -rf "$pkgdir" "$srcdir" if [[ -n $pkgbase ]]; then local fullver=$(get_full_version) + local logarch=$CARCH + if [[ $arch = "any" ]]; then + logarch="any" + fi + # Can't do this unless the BUILDSCRIPT has been sourced. if (( BUILDFUNC )); then - rm -f "${pkgbase}-${fullver}-${CARCH}-build.log"* + rm -f "${pkgbase}-${fullver}-${logarch}-build.log"* fi if (( CHECKFUNC )); then - rm -f "${pkgbase}-${fullver}-${CARCH}-check.log"* + rm -f "${pkgbase}-${fullver}-${logarch}-check.log"* fi if (( PKGFUNC )); then - rm -f "${pkgbase}-${fullver}-${CARCH}-package.log"* + rm -f "${pkgbase}-${fullver}-${logarch}-package.log"* elif (( SPLITPKG )); then for pkg in ${pkgname[@]}; do - rm -f "${pkgbase}-${fullver}-${CARCH}-package_${pkg}.log"* + rm -f "${pkgbase}-${fullver}-${logarch}-package_${pkg}.log"* done fi @@ -974,7 +979,13 @@ run_function() { local ret=0 if (( LOGGING )); then local fullver=$(get_full_version) - local BUILDLOG="${startdir}/${pkgbase}-${fullver}-${CARCH}-$pkgfunc.log" + + local logarch=$CARCH + if [[ $arch = "any" ]]; then + logarch="any" + fi + + local BUILDLOG="${startdir}/${pkgbase}-${fullver}-${logarch}-$pkgfunc.log" if [[ -f $BUILDLOG ]]; then local i=1 while true; do -- 1.7.10.4

3 4

[pacman-dev] [PATCH] Create split package dirs first
by Emil Renner Berthing 20 Jun '12

20 Jun '12

Hi, When creating split packages I always wished one could just do make install in one of the package functions and then directly move the files belonging to other packages off to their respective pkgdirs. If you look at the PKGBUILD for systemd this is basically what it's doing except for one thing: the pkgdirs aren't created before calling the package functions. To work around this it creates it's own temporary _$pkgdir directories, moves the files to there and then from there to their proper destination in the later package functions. The following small patch fixes this. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 718b4e9..2a2901c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1924,9 +1924,11 @@ restore_package_variables() { run_split_packaging() { local pkgname_backup=${pkgname[@]} for pkgname in ${pkgname_backup[@]}; do + mkdir -p "$pkgdir/$pkgname" + chmod a-s "$pkgdir/$pkgname" + done + for pkgname in ${pkgname_backup[@]}; do pkgdir="$pkgdir/$pkgname" - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" backup_package_variables run_package $pkgname tidy_install

2 2

[pacman-dev] [PATCH 1/2] pacman-key: Use lsign_keys function in --populate
by Pierre Schmitz 20 Jun '12

20 Jun '12

This reduces code duplication and also makes --populate a non-interactive function. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- scripts/pacman-key.sh.in | 3 ++- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ae491d2..e5b6021 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -302,7 +302,7 @@ populate_keyring() { msg "$(gettext "Locally signing trusted keys in keyring...")" for key_id in "${!trusted_ids[@]}"; do msg2 "$(gettext "Locally signing key %s...")" "${key_id}" - "${GPG_PACMAN[@]}" --quiet --lsign-key "${key_id}" + lsign_keys "${key_id}" done msg "$(gettext "Importing owner trust values...")" for keyring in "${KEYRINGIDS[@]}"; do @@ -440,6 +440,7 @@ list_sigs() { lsign_keys() { check_keyids_exist + # we cannot use --yes here as gpg would still ask for confirmation if a key has more than one uid printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "$@" 2>/dev/null if (( PIPESTATUS[1] )); then error "$(gettext "A specified key could not be locally signed.")" -- 1.7.10.4

2 6

[pacman-dev] [PATCH] pacman-key: hanlde local signing of multiple keys
by Allan McRae 20 Jun '12

20 Jun '12

gpg --lsign-key does not like being given multiple keys to sign. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-key.sh.in | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index e5b6021..d2389b0 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -301,7 +301,6 @@ populate_keyring() { if (( ${#trusted_ids[@]} > 0 )); then msg "$(gettext "Locally signing trusted keys in keyring...")" for key_id in "${!trusted_ids[@]}"; do - msg2 "$(gettext "Locally signing key %s...")" "${key_id}" lsign_keys "${key_id}" done msg "$(gettext "Importing owner trust values...")" @@ -440,10 +439,19 @@ list_sigs() { lsign_keys() { check_keyids_exist - # we cannot use --yes here as gpg would still ask for confirmation if a key has more than one uid - printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "$@" 2>/dev/null - if (( PIPESTATUS[1] )); then - error "$(gettext "A specified key could not be locally signed.")" + + local ret=0 + for key_id in "$@"; do + msg2 "$(gettext "Locally signing key %s...")" "${key_id}" + # we cannot use --yes here as gpg would still ask for confirmation if a key has more than one uid + printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "${key_id}" 2>/dev/null + if (( PIPESTATUS[1] )); then + error "$(gettext "%s could not be locally signed.")" "${key_id}" + ret=1 + fi + done + + if (( ret )); then exit 1 fi } -- 1.7.11

2 2

[pacman-dev] [PATCH] remove comments blocking zsh completion for names
by Daniel Wallace 20 Jun '12

20 Jun '12

Apparently I missed when This was actually added, but I had it in with the first patch, just remove the comments for completion of names with pacman-key --list-keys etc. Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> --- contrib/zsh_completion.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index e81257b..84ee93c 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -420,12 +420,11 @@ _keys() { if (match($NF, /<[^>]+>/)) print substr($NF, RSTART + 1, RLENGTH - 2) #this adds support for names as well if that is ever added - # } - #$1 == "uid" { - #for (i=2;i<NF;i++) {printf "%s%s",sep, $i;sep=" "}; printf "\n" - }' #|sed -e 's/(.*)//g' -e 's/^\ //g' -e 's/\ *$//g' |uniq + } + $1 == "uid" { + for (i=2;i<NF;i++) {printf "%s%s",sep, $i;sep=" "}; printf "\n" + }' |sed -e 's/(.*)//g' -e 's/^\ //g' -e 's/\ *$//g' |uniq ) - #keys=(${keylist//$'\n'/\/}) keys=(${(s:/:)${keylist//$'\n'/\/}}) _describe -t modules 'keys in keyring' keys && return 0 } -- 1.7.11

2 1

[pacman-dev] [PATCH] Allow cleaning only some cachedirs
by Jan Alexander Steffens (heftig) 19 Jun '12

19 Jun '12

From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> When cleaning the cache, ask for each cachedir separately. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> --- src/pacman/sync.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 3b09485..5210bbf 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -172,10 +172,6 @@ static int sync_cleancache(int level) alpm_list_t *cachedirs = alpm_option_get_cachedirs(config->handle); int ret = 0; - for(i = cachedirs; i; i = alpm_list_next(i)) { - printf(_("Cache directory: %s\n"), (const char *)i->data); - } - if(!config->cleanmethod) { /* default to KeepInstalled if user did not specify */ config->cleanmethod = PM_CLEAN_KEEPINST; @@ -189,22 +185,28 @@ static int sync_cleancache(int level) if(config->cleanmethod & PM_CLEAN_KEEPCUR) { printf(_(" All current sync database packages\n")); } - if(!yesno(_("Do you want to remove all other packages from cache?"))) { - return 0; - } - printf(_("removing old packages from cache...\n")); - } else { - if(!noyes(_("Do you want to remove ALL files from cache?"))) { - return 0; - } - printf(_("removing all files from cache...\n")); } for(i = cachedirs; i; i = alpm_list_next(i)) { const char *cachedir = i->data; - DIR *dir = opendir(cachedir); + DIR *dir; struct dirent *ent; + printf(_("Cache directory: %s\n"), (const char *)i->data); + + if(level == 1) { + if(!yesno(_("Do you want to remove all other packages from cache?"))) { + continue; + } + printf(_("removing old packages from cache...\n")); + } else { + if(!noyes(_("Do you want to remove ALL files from cache?"))) { + continue; + } + printf(_("removing all files from cache...\n")); + } + + dir = opendir(cachedir); if(dir == NULL) { pm_printf(ALPM_LOG_ERROR, _("could not access cache directory %s\n"), cachedir); -- 1.7.10.4

2 1

[pacman-dev] [PATCH] Added syntax highlighting for the sha256sums, sha384sums, and sha512sums arrays Fixed FS#29213
by jstjohn＠purdue.edu 19 Jun '12

19 Jun '12

From: "Jason St. John" <jstjohn(a)purdue.edu> Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- contrib/PKGBUILD.vim | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 4d69e4d..72334e4 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -69,8 +69,8 @@ syn match pbUrlGroup /^url=.*/ contains=pbValidUrl,pb_k_url,pbIllegalUrl,shDoubl " license syn keyword pb_k_license license contained " echo $(pacman -Ql licenses | grep '/usr/share/licenses/common/' | cut -d'/' -f6 | sort -u) -syn keyword pbLicense APACHE CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PerlArtistic PHP PSF RALINK RUBY ZPL contained -" special cases from http://wiki.archlinux.org/index.php/Arch_Packaging_Standards +syn keyword pbLicense AGPL AGPL3 Apache APACHE Artistic2.0 CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PerlArtistic PHP PSF RUBY W3C ZPL contained +" special cases from https://wiki.archlinux.org/index.php/Arch_Packaging_Standards syn keyword pbLicenseSpecial BSD MIT ZLIB Python contained syn match pbLicenseCustom /custom$:[[:alnum:]]*$*/ contained syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicenseSpecial,pbLicense @@ -176,6 +176,39 @@ hi def link pbSha1Quotes Keyword hi def link pbSha1Hash Error hi def link pbValidSha1sums Number +" sha256sums +syn keyword pb_k_sha256sums sha256sums contained +syn match pbIllegalSha256sums /[^='"()\/ ]/ contained contains=pbValidSha256sums +syn match pbValidSha256sums /\x\{64\}/ contained +syn region pbSha256sumsGroup start=/^sha256sums/ end=/)/ contains=pb_k_sha256sums,pbSha256Quotes,pbSha256Hash,pbIllegalSha256sums keepend +syn match pbSha256Quotes /'.*'\|".*"/ contained contains=pbSha256Hash,pbIllegalSha256sums +syn match pbSha256Hash /\x\+/ contained contains=pbValidSha256sums +hi def link pbSha256Quotes Keyword +hi def link pbSha256Hash Error +hi def link pbValidSha256sums Number + +" sha384sums +syn keyword pb_k_sha384sums sha384sums contained +syn match pbIllegalSha384sums /[^='"()\/ ]/ contained contains=pbValidSha384sums +syn match pbValidSha384sums /\x\{96\}/ contained +syn region pbSha384sumsGroup start=/^sha384sums/ end=/)/ contains=pb_k_sha384sums,pbSha384Quotes,pbSha384Hash,pbIllegalSha384sums keepend +syn match pbSha384Quotes /'.*'\|".*"/ contained contains=pbSha384Hash,pbIllegalSha384sums +syn match pbSha384Hash /\x\+/ contained contains=pbValidSha384sums +hi def link pbSha384Quotes Keyword +hi def link pbSha384Hash Error +hi def link pbValidSha384sums Number + +" sha512sums +syn keyword pb_k_sha512sums sha512sums contained +syn match pbIllegalSha512sums /[^='"()\/ ]/ contained contains=pbValidSha512sums +syn match pbValidSha512sums /\x\{128\}/ contained +syn region pbSha512sumsGroup start=/^sha512sums/ end=/)/ contains=pb_k_sha512sums,pbSha512Quotes,pbSha512Hash,pbIllegalSha512sums keepend +syn match pbSha512Quotes /'.*'\|".*"/ contained contains=pbSha512Hash,pbIllegalSha512sums +syn match pbSha512Hash /\x\+/ contained contains=pbValidSha512sums +hi def link pbSha512Quotes Keyword +hi def link pbSha512Hash Error +hi def link pbValidSha512sums Number + " options syn keyword pb_k_options options contained syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|buildflags$/ contained @@ -258,6 +291,15 @@ hi def link pbIllegalMd5sums Error hi def link pb_k_sha1sums pbKeywords hi def link pbIllegalSha1sums Error +hi def link pb_k_sha256sums pbKeywords +hi def link pbIllegalSha256sums Error + +hi def link pb_k_sha384sums pbKeywords +hi def link pbIllegalSha384sums Error + +hi def link pb_k_sha512sums pbKeywords +hi def link pbIllegalSha512sums Error + hi def link pb_k_options pbKeywords hi def link pbOptionsDeprec Todo hi def link pbIllegalOption Error -- 1.7.10.4

2 1

[pacman-dev] [PATCH] Fixed FS#29213 and added Vim syntax highlighting for sha256sums, sha384sums, and sha512sums arrays
by Jason St. John 18 Jun '12

18 Jun '12

Hello, This is a patch submission for the latest pacman code in the Git repository. My patch fixes FS#29213 and adds proper Vim syntax highlighting for the sha256sums, sha384sums, and sha512sums arrays in PKGBUILDs. I asked falconindy in #archlinux-pacman about how to submit my patch, and because I use web mail exclusively (so I can't use `git send-email`), we decided it would be best for me to publish the change on GitHub and link it here. He warned me that pasting the diff in the body of the message would result in it becoming mangled on the mailing list. https://github.com/jrstjohn/pacman/commit/bf674fb168288e2e9f30cb85cc0dc69a9… Thanks! Jason

1 0

[pacman-dev] [PATCH 0/5] Random fixes from my working branch
by Dave Reisner 14 Jun '12

14 Jun '12

Posting this random collection of patches before they grow hair and develop a personality more likeable than mine. Dave Reisner (5): add real_line_size to alpm_read_buffer add line length parameter to _alpm_strip_newline contrib: sed out @SCRIPTNAME@ in edit command updpkgsums: avoid fancy quoting in error message diskspace: log errors when opening the mount table fails contrib/Makefile.am | 1 + contrib/updpkgsums.sh.in | 2 +- lib/libalpm/be_local.c | 14 +++++++------- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 8 ++++---- lib/libalpm/diskspace.c | 6 ++++++ lib/libalpm/util.c | 12 +++++++----- lib/libalpm/util.h | 3 ++- 8 files changed, 29 insertions(+), 19 deletions(-) -- 1.7.10.4

2 6

[pacman-dev] [PATCH 2/2] Allow wildcards in PURGE_TARGETS to match any type of file except for directories.
by jhuntwork＠lightcubesolutions.com 12 Jun '12

12 Jun '12

From: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b0918ae..eb239e3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1048,7 +1048,7 @@ tidy_install() { local pt for pt in "${PURGE_TARGETS[@]}"; do if [[ ${pt} = "${pt//\/}" ]]; then - find . -type f -name "${pt}" -exec rm -f -- '{}' \; + find . ! -type d -name "${pt}" -exec rm -f -- '{}' \; else rm -f ${pt} fi -- 1.7.1

3 10

[pacman-dev] Utility functions for PKGBUILDs
by Aaron DeVore 08 Jun '12

08 Jun '12

I have noticed that the PKGBUILD's for the AUR packages that I maintain contain a lot of duplicate code. For example, license installation: install -D -m644 COPYING \ "$pkgname/usr/share/licenses/$pkgname/COPYING" appears frequently. It would be useful to have a utility function instead: # pkg-license <license file> function pkg-license() { install -D -m644 "$1" "$pkgdir/usr/share/licenses/$pkgname/$(basename $1)" } That would appear in package() as: pkg-license COPYING Other candidates are Python 2 shebang rewriting (pkg-py2rewrite), installing documentation (pkg-doc), Python setup.py calls (pkg-pyinst/pkg-py3inst), and patches (pkg-patch). Many other distros contain such functions. From what I've seen, the functions can help make packages more concise and less error prone. I will be taking a university course in open source software development over the summer. We need to pick a project to work on during the course. Would adding utility functions to makepkg/PKGBUILDs be acceptable to Arch? -Aaron DeVore

3 2

[pacman-dev] [PATCH] repo-add: add checkdepends information
by Allan McRae 08 Jun '12

08 Jun '12

Similar to the case for makedepends, it is useful to be able to access this information without parsing a PKGBUILD. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 6 ++++++ scripts/makepkg.sh.in | 19 ++++++++++--------- scripts/repo-add.sh.in | 4 +++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 4033be6..4028916 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -597,6 +597,12 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, READ_NEXT(); if(strlen(line) == 0) break; } + } else if(strcmp(line, "%CHECKDEPENDS%") == 0) { + /* currently unused */ + while(1) { + READ_NEXT(); + if(strlen(line) == 0) break; + } } else if(strcmp(line, "%CONFLICTS%") == 0) { READ_AND_SPLITDEP(pkg->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 63cdd4d..abfabdf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1282,15 +1282,16 @@ write_pkginfo() { mapfile -t provides < <(find_libprovides) mapfile -t depends < <(find_libdepends) - [[ $license ]] && printf "license = %s\n" "${license[@]}" - [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" - [[ $groups ]] && printf "group = %s\n" "${groups[@]}" - [[ $conflicts ]] && printf "conflict = %s\n" "${conflicts[@]}" - [[ $provides ]] && printf "provides = %s\n" "${provides[@]}" - [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" - [[ $depends ]] && printf "depend = %s\n" "${depends[@]}" - [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" - [[ $makedepends ]] && printf "makedepend = %s\n" "${makedepends[@]}" + [[ $license ]] && printf "license = %s\n" "${license[@]}" + [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" + [[ $groups ]] && printf "group = %s\n" "${groups[@]}" + [[ $conflicts ]] && printf "conflict = %s\n" "${conflicts[@]}" + [[ $provides ]] && printf "provides = %s\n" "${provides[@]}" + [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" + [[ $depends ]] && printf "depend = %s\n" "${depends[@]}" + [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" + [[ $makedepends ]] && printf "makedepend = %s\n" "${makedepends[@]}" + [[ $checkdepends ]] && printf "checkdepend = %s\n" "${checkdepends[@]}" local it for it in "${packaging_options[@]}"; do diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index e43f096..504cae9 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -257,7 +257,7 @@ db_write_entry() { # blank out all variables local pkgfile=$1 local -a _groups _licenses _replaces _depends _conflicts _provides \ - _optdepends _makedepends + _optdepends _makedepends _checkdepends local pkgname pkgver pkgdesc csize size url arch builddate packager \ md5sum sha256sum pgpsig pgpsigsize @@ -278,6 +278,7 @@ db_write_entry() { provides) _provides+=("$provides") ;; optdepend) _optdepends+=("$optdepend") ;; makedepend) _makedepends+=("$makedepend") ;; + checkdepend) _checkdepends+=("$checkdepend") ;; esac done< <(bsdtar -xOqf "$pkgfile" .PKGINFO) @@ -365,6 +366,7 @@ db_write_entry() { format_entry "PROVIDES" "${_provides[@]}" format_entry "OPTDEPENDS" "${_optdepends[@]}" format_entry "MAKEDEPENDS" "${_makedepends[@]}" + format_entry "CHECKDEPENDS" "${_checkdepends[@]}" } >'depends' popd >/dev/null -- 1.7.10.3

2 1

[pacman-dev] [PATCH] contrib: fix typo in PKGBUILD.vim
by Allan McRae 08 Jun '12

08 Jun '12

FS#30156 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/PKGBUILD.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 4d69e4d..ee1e45f 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -108,7 +108,7 @@ syn match pbValidOptdepends /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbOptdependsGroup start=/^optdepends=(/ end=/)/ contains=pb_k_optdepends,pbValidOptdepends,shDoubleQuote,shSingleQuote " checkdepends -syn keyword pb_k_ckdepends ckdepends contained +syn keyword pb_k_ckdepends checkdepends contained syn match pbValidCkdepends /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbCkdependsGroup start=/^checkdepends=(/ end=/)/ contains=pb_k_ckdepends,pbValidCkdepends,shDoubleQuote,shSingleQuote -- 1.7.10.4

1 0

[pacman-dev] [PATCH] pacman: print version information in debug output
by Allan McRae 07 Jun '12

07 Jun '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 73d5be9..6226ee1 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -857,6 +857,8 @@ int main(int argc, char *argv[]) } } + pm_printf(ALPM_LOG_DEBUG, "pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.10.3

2 1

[pacman-dev] [PATCH] makepkg: add support for SVN urls
by Allan McRae 07 Jun '12

07 Jun '12

Allow SVN repo sources in the form: source=("<folder>::<repo>#<fragment>") where <repo> must start with svn (e.g svn+http://) and a <fragment> can specify a revision (e.g. revision=22). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- If anyone knows stuff about CVS, Mercurial, Darcs or Bazaar and what fragments should be supported for them, let me know... scripts/makepkg.sh.in | 73 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 56f2871..8d20d44 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -196,7 +196,7 @@ get_filepath() { local proto="$(get_protocol "$1")" case $proto in - git*) + git*|svn*) if [[ -d "$startdir/$file" ]]; then file="$startdir/$file" elif [[ -d "$SRCDEST/$file" ]]; then @@ -437,6 +437,72 @@ download_git() { popd &>/dev/null } +download_svn() { + local netfile=$1 + + local fragment=${netfile##*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + fi + + local folder=$(get_filepath "$netfile") + [[ -z "$folder" ]] && folder="$SRCDEST/$(get_filename "$netfile")" + + local repo=${netfile##*/} + repo=${repo%%#*} + + local url=$(get_url "$netfile") + if [[ $url != svn+ssh* ]]; then + url=${url##*svn+} + fi + url=${url%%#*} + + if [[ ! -d $folder ]]; then + msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn" + if ! svn checkout --config-dir $folder "$url" "$folder"; then + error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn" + cd_safe "$folder" + if ! svn update; then + # only warn on failure to allow offline builds + warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "svn" + fi + fi + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" + pushd "$srcdir" &>/dev/null + rm -rf ${folder##*/} + cp -a $folder . + + cd_safe ${folder##*/} + + if [[ -n $fragment ]]; then + case $fragment in + revision=*) + ref=${fragment##*=} + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + + if [[ -n $ref ]]; then + if ! svn up -r $ref; then + error "$(gettext "Failure while checking out reference %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + fi + fi + + popd &>/dev/null +} + download_sources() { msg "$(gettext "Retrieving Sources...")" @@ -456,6 +522,9 @@ download_sources() { git*) download_git "$netfile" ;; + svn*) + download_svn "$netfile" + ;; *) error "$(gettext "Unknown download protocol: %s")" "$proto" plain "$(gettext "Aborting...")" @@ -827,7 +896,7 @@ generate_checksums() { proto="$(get_protocol "$netfile")" case $proto in - git*) + git*|svn*) sum="SKIP" ;; *) -- 1.7.10.3

1 0