June 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] Examples in the manpages
by Nico Schottelius 04 Oct '11

04 Oct '11

Dear pacman-devs, after a funny replace pacman-with-pacman-git evening, I digged around a bit into makepkg and pacman and noticed there are no examples in the manpages. Is that intented or would you like to/accept patches which add the EXAMPLES section? Cheers, Nico -- New PGP key: 7ED9 F7D3 6B10 81D7 0EC5 5C09 D7DC C8E4 3187 7DF0 Please resign, if you signed 9885188C or 8D0E27A4. Currently moving *.schottelius.org to http://www.nico.schottelius.org/ ...

13 47

[pacman-dev] [PATCH 0/3] Add --verifylvl option to pacman
by Pang Yan Han 31 Aug '11

31 Aug '11

This is a reroll of a series to add the --verifylvl option to pacman, taking into account of the recent changes in libalpm. The --verifylvl option can be used to change pacman's signature verification level to one of "always", "optional", or "never". Patch 1/3 changes option_verifysig to accept non-capitalized versions of "Always", "Optional" and "Never". Patch 2/3 adds the --verifylvl to pacman. Patch 3/3 adds the "VerifySig" option to etc/pacman.conf.in Pang Yan Han (3): option_verifysig: Accept non-caps sig levels pacman: Add --verifylvl option etc/pacman.conf.in : Add VerifySig option doc/pacman.8.txt | 7 +++++++ etc/pacman.conf.in | 1 + src/pacman/conf.c | 15 ++++++++++++--- src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 6 ++++++ 5 files changed, 29 insertions(+), 4 deletions(-) -- 1.7.6.rc0

3 6

[pacman-dev] Fun output when repo db is missing
by Allan McRae 18 Aug '11

18 Aug '11

I just saw this: allan@mugen ~ > sudo mv /var/lib/pacman/sync/allanbrokeit.db{,.bak} allan@mugen ~ > pacman -Su | wc -l Proceed with installation? [Y/n] n 1148 That is a lot of copies of: error: could not open file /var/lib/pacman/sync/allanbrokeit.db: Failed to open '/var/lib/pacman/sync/allanbrokeit.db' Allan

3 2

[pacman-dev] [PATCH 0/2] Add support for verifying pgp signatures to makepkg
by Wieland Hoffmann 19 Jul '11

19 Jul '11

Hi, this adds support for verifying pgp signatures provided by upstream to makepkg. A new array pgpsigs is defined holding the URLs to all the signature files. However, there're still a few quirks: * You have to manually import the key which signed the source. Actually that's good, but: * You don't know why the verification failed. It's either a wrong signature or the key is simply not known to gnupg. This is really bad, so I've chosen to make pgp verification optional for now. makepkg --pgp enables it. Wieland Hoffmann (2): Add support for verifying pgp signatures to makepkg And update the manpages accordingly doc/PKGBUILD.5.txt | 5 ++++ doc/makepkg.8.txt | 3 ++ scripts/makepkg.sh.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 2 deletions(-) -- 1.7.5.4

4 24

[pacman-dev] [PATCH] pacman-key: Add --import and --import-trustdb
by Pang Yan Han 16 Jul '11

16 Jul '11

Currently, pacman-key allows users to import their keys using the --add option but no similar functionality exists for importing ownertrust values. The --import-trustdb option takes in a list of directories and imports ownertrust values if the directories have a trustdb.gpg database. The --import is a combination of --add and --import-trustdb. It takes in a list of directories and imports keys from pubring.gpg, ownertrust values from trustdb.gpg if any of these files exist. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- NOTE: There is this very strange bug such that when new keys are added, previously imported keys will fail for signature verification. This happens with both --add and --import. Eg. Say you want to import trustdb.gpg and pubring.gpg from directories "first", "second" and "third", you'd have to: # pacman-key --import first second third # pacman-key --import first second third doc/pacman-key.8.txt | 7 +++++++ scripts/pacman-key.sh.in | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 892f14d..6071474 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -59,6 +59,13 @@ Commands *-h, \--help*:: Output syntax and command line options. +*\--import* dir ...:: + Adds keys from pubring.gpg into pacman's keyring and imports ownertrust + values from trustdb.gpg in the specified directories. + +*\--import-trustdb* dir ...:: + Imports ownertrust values from trustdb.gpg in the specified directories. + *-l, \--list*:: Equivalent to --list-sigs from GnuPG. diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 20ec20f..425f010 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -70,6 +70,8 @@ usage() { echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" echo "$(gettext " -V, --version Show program version")" echo "$(gettext " --adv <params> Use pacman's keyring with advanced gpg commands")" + echo "$(gettext " --import <dir(s)> Imports pubring.gpg and trustdb.gpg from dir(s)")" + echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" printf "$(gettext " --reload Reload the default keys")" echo } @@ -228,6 +230,27 @@ if [[ $1 != "--version" && $1 != "-V" && $1 != "--help" && $1 != "-h" && $1 != " fi fi +import() { + local importdir + for importdir in "$@"; do + if [[ -f "${importdir}/trustdb.gpg" ]]; then + import_trustdb "${importdir}" + fi + if [[ -f "${importdir}/pubring.gpg" ]]; then + ${GPG_PACMAN} --quiet --batch --import "${importdir}/pubring.gpg" + fi + done +} + +import_trustdb() { + local importdir + for importdir in "$@"; do + if [[ -f "${importdir}/trustdb.gpg" ]]; then + gpg --homedir "${importdir}" --export-ownertrust | ${GPG_PACMAN} --import-ownertrust + fi + done +} + # Parse global options CONFIG="@sysconfdir@/pacman.conf" PACMAN_KEYRING_DIR="@sysconfdir@/pacman.d/gnupg" @@ -322,6 +345,20 @@ case "${command}" in ;; -h|--help) usage; exit 0 ;; + --import-trustdb) + if (( $# == 0 )); then + error "$(gettext "You need to specify at least one trustdb")" + exit 1 + fi + import_trustdb "$@" + ;; + --import) + if (( $# == 0 )); then + error "$(gettext "You need to specify at least one gpg directory")" + exit 1 + fi + import "$@" + ;; -V|--version) version; exit 0 ;; *) -- 1.7.6.rc0

2 3

[pacman-dev] [PATCH 00/25] Rename types from pmfoo_t to alpm_foo_t
by Allan McRae 09 Jul '11

09 Jul '11

After discussion here and on IRC, it was decided that rather than changing the one struct from alpm_foo_t to pmfoo_t for consistency, it would instead be better to rename all the other structs to follow the alpm_foo_t scheme. Given we are pushing towards 4.0, now is the best (only?) time to do this. I am not going to send the enitre patchset here as that would just be overkill. Take a look at the patches in my repo: http://projects.archlinux.org/users/allan/pacman.git/log/?h=breakshit Allan McRae (25): Rename pmpkgreason_t to alpm_pkgreason_t Rename pmdepmod_t to alpm_depmod_t Rename pmfileconflicttype_t to alpm_fileconflicttype_t Rename pmhandle_t to alpm_handle_t Rename pmdb_t to alpm_db_t Rename pmtrans_t to alpm_trans_t Rename pmdepend_t to alpm_depend_t Rename pmdepmissing_t to alpm_depmissing_t Rename pmconflict_t to alpm_conflict_t Rename pmfileconflict_t to alpm_fileconflict_t Rename pmgrp_t to alpm_grp_t Rename pmdelta_t to alpm_delta_t Rename pmbackup_t to alpm_backup_t Rename pmloglevel_t to alpm_loglevel_t Rename pmtransflag_t to alpm_transflag_t Rename pmtransevt_t to alpm_transevt_t Rename pmtransconv_t to alpm_transconv_t Rename pmtransprog_t to alpm_transprog_t Rename pmerrno_t to alpm_errno_t Rename pmpkgfrom_t to alpm_pkgfrom_t Rename pmgraph_t to alpm_graph_t Rename pmpkghash_t to alpm_pkghash_t Rename pmtransstate_t to alpm_transstate_t Rename pmdbinfrq_t to alpm_dbinfrq_t Rename _pmdbstatus_t to _alpm_dbstatus_t lib/libalpm/add.c | 34 +++--- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 12 +- lib/libalpm/alpm.h | 354 +++++++++++++++++++++++----------------------- lib/libalpm/backup.c | 16 +- lib/libalpm/backup.h | 8 +- lib/libalpm/be_local.c | 82 ++++++------ lib/libalpm/be_package.c | 30 ++-- lib/libalpm/be_sync.c | 34 +++--- lib/libalpm/conflict.c | 62 ++++---- lib/libalpm/conflict.h | 12 +- lib/libalpm/db.c | 92 ++++++------ lib/libalpm/db.h | 62 ++++---- lib/libalpm/delta.c | 68 +++++----- lib/libalpm/delta.h | 8 +- lib/libalpm/deps.c | 136 +++++++++--------- lib/libalpm/deps.h | 16 +- lib/libalpm/diskspace.c | 18 ++-- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 6 +- lib/libalpm/dload.h | 4 +- lib/libalpm/error.c | 4 +- lib/libalpm/graph.c | 8 +- lib/libalpm/graph.h | 8 +- lib/libalpm/group.c | 8 +- lib/libalpm/group.h | 4 +- lib/libalpm/handle.c | 108 +++++++------- lib/libalpm/handle.h | 20 ++-- lib/libalpm/log.c | 4 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 154 ++++++++++---------- lib/libalpm/package.h | 86 ++++++------ lib/libalpm/pkghash.c | 36 +++--- lib/libalpm/pkghash.h | 18 ++-- lib/libalpm/remove.c | 48 +++--- lib/libalpm/remove.h | 8 +- lib/libalpm/signing.c | 12 +- lib/libalpm/signing.h | 4 +- lib/libalpm/sync.c | 108 +++++++------- lib/libalpm/sync.h | 4 +- lib/libalpm/trans.c | 38 +++--- lib/libalpm/trans.h | 20 ++-- lib/libalpm/util.c | 14 +- lib/libalpm/util.h | 18 ++-- src/pacman/callback.c | 10 +- src/pacman/callback.h | 8 +- src/pacman/conf.c | 8 +- src/pacman/conf.h | 4 +- src/pacman/database.c | 4 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 14 +- src/pacman/package.h | 8 +- src/pacman/query.c | 36 +++--- src/pacman/remove.c | 14 +- src/pacman/sync.c | 80 +++++----- src/pacman/upgrade.c | 12 +- src/pacman/util.c | 40 +++--- src/pacman/util.h | 14 +- src/util/cleanupdelta.c | 10 +- src/util/pactree.c | 18 ++-- src/util/testdb.c | 14 +- src/util/testpkg.c | 8 +- 62 files changed, 1048 insertions(+), 1048 deletions(-) -- 1.7.6

3 8

[pacman-dev] [PATCH] makepkg: Add UPX compression support
by Allan McRae 03 Jul '11

03 Jul '11

This patch enables the automatic compression of executable binaries using UPX when the 'upx' options is specified in makepkg.conf or the PKGBUILD. Additional arguments can be passed to UPX by specifying the UPXFLAGS variable. Original-patch-by: Bryce Gibson <bryce(a)gibson-consulting.com.au> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 3 +++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 13 ++++++++++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 24e1a12..4d76121 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -231,6 +231,9 @@ version. Appending the version yourself disables auto detection. *zipman*;; Compress man and info pages with gzip. + *upx*;; + Compress binary executable files using UPX. + *ccache*;; Allow the use of ccache during build. More useful in its negative form `!ccache` with select packages that have problems building diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 3ce4759..48f5ef5 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -114,7 +114,7 @@ Options Specify a key to use for gpg signing instead of the default key in the keyring. Can be overridden with makepkg's `--key` option. -**OPTIONS=(**strip !docs libtool emptydirs zipman**)**:: +**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -146,6 +146,10 @@ Options Remove files specified by the `PURGE_TARGETS` variable from the package. + *upx*;; + Compress binary executable files using UPX. Additional options + can be passed to UPX by specifying the `UPXFLAGS` variable. + **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this affects both generation and checking. The current valid options are: diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9a790fc..42ae940 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -60,7 +60,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -69,8 +69,9 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX # -OPTIONS=(strip docs libtool emptydirs zipman purge) +OPTIONS=(strip docs libtool emptydirs zipman purge !upx) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 78cd4cf..b0247bd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,7 +44,7 @@ startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ @@ -940,6 +940,17 @@ tidy_install() { msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -empty -delete fi + + if [[ $(check_option upx) = "y" ]]; then + msg2 "$(gettext "Compressing binaries with %s...")" "UPX" + local binary + find . -type f -perm -u+w 2>/dev/null | while read binary ; do + if [[ $(file -bi "$binary") = *'application/x-executable'* ]]; then + upx $UPXFLAGS "$binary" &>/dev/null || + warning "$(gettext "Could not compress binary : %s")" "${binary/$pkgdir\//}" + fi + done + fi } find_libdepends() { -- 1.7.5.4

3 15

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-403-gcf1401a
by dan＠archlinux.org 01 Jul '11

01 Jul '11

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 cf1401a04d5179c89af6460b812e171cc2da19f0 (commit) via 23a2d2c16a87dc8744b8307bded9fabb503dde13 (commit) via 68284da0d72bf27ac3dc5cfc1cd02d16f824130c (commit) via 6633b8e5c290dbb1b0382f3f960e1f7134247a68 (commit) via 98a2fc8deba6be37729c26cf68e9927f6466c95e (commit) via 35ffe6af2d8d38849a7711a4c6add3d14490816c (commit) via 0ed848a9ea7a543192cef1ca78695a9046ee4e98 (commit) via 13235ba65ab55d852dbdc0acabdc047442e74e28 (commit) via b94e8ecd1fec4426baab8c90e7fc0d5583acdbef (commit) from 9efd10cd2ac9a7654b2c7c94df86bf09ab54f41a (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 cf1401a04d5179c89af6460b812e171cc2da19f0 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 29 18:25:44 2011 -0500 signing: check validity of all available signatures Change the check into a loop over all signatures present and returned by GPGME. Also modify the return values and checks slightly now that I know a little bit more about what type of values are returned. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 23a2d2c16a87dc8744b8307bded9fabb503dde13 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 15:41:56 2011 -0500 Make alpm_db_get_sigverify_level() public Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68284da0d72bf27ac3dc5cfc1cd02d16f824130c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 23:05:21 2011 -0500 Add an alpm_db_get_valid() public function This allows one to check if a database is valid or invalid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6633b8e5c290dbb1b0382f3f960e1f7134247a68 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jun 25 16:45:01 2011 -0400 move proto files to new subdirectory, proto/ Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98a2fc8deba6be37729c26cf68e9927f6466c95e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 10:49:55 2011 -0400 pacman: return with 128+signum on signaled exit This is a convention that is widely followed in *nix and posix-ish environments. We should follow it, too. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35ffe6af2d8d38849a7711a4c6add3d14490816c Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 30 12:02:33 2011 -0500 pactest: remove no longer necessary newline hacks libalpm can now cope with this as of commit 719e0d3ddb300. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0ed848a9ea7a543192cef1ca78695a9046ee4e98 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:35:32 2011 -0500 pactest: create packages in memory This is similar to what was just done for the sync databases. Move a few pieces around so we never need to actually write out the filesystem to create a package, and simply stream the tarfile out from the data we've collected. Once again, a few newline addition hacks and other things have to be left in place in order not to break everything; this time however most of the assumptions are in pactest and not libalpm. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 13235ba65ab55d852dbdc0acabdc047442e74e28 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 28 22:02:58 2011 -0500 Make local_db_read() private to the local backend There is little need to expose the guts of this function even within the library. Make it static in be_local.c, and clean up a few other things since we know exactly where it is being called from: * Remove unnecessary origin checks in _cache_get_*() methods- if you are calling a cache method your package type will be correct. * Remove sanity checks within local_db_read() itself- packages will always have a name and version if they get this far, and the package object will never be NULL either. The one case calling this from outside the backend was in add.c, where we forced a full load of a package before we duplicated it. Move this concern elsewhere and have pkg_dup() always force a full package load via a new force_load() function on the operations callback struct. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b94e8ecd1fec4426baab8c90e7fc0d5583acdbef Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 28 17:46:04 2011 -0500 Fix a few warnings pointed out via clang scan-build Some of these are legit (the backup hash NULL checks), while others are either extemely unlikely or just impossible for the static code analysis to prove, but are worth adding anyway because they have little overhead. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 6 +- lib/libalpm/add.c | 26 +++---- lib/libalpm/alpm.h | 16 ++++ lib/libalpm/backup.c | 2 +- lib/libalpm/be_local.c | 46 +++++------- lib/libalpm/be_sync.c | 5 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/db.c | 19 +++++ lib/libalpm/db.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/package.c | 8 ++ lib/libalpm/package.h | 2 + lib/libalpm/signing.c | 72 +++++++----------- lib/libalpm/signing.h | 1 - lib/libalpm/sync.c | 2 +- ChangeLog.proto => proto/ChangeLog.proto | 0 PKGBUILD-split.proto => proto/PKGBUILD-split.proto | 0 PKGBUILD.proto => proto/PKGBUILD.proto | 0 proto.install => proto/proto.install | 0 src/pacman/pacman.c | 9 ++- test/pacman/pmdb.py | 9 +- test/pacman/pmpkg.py | 56 +++++++++----- test/pacman/pmtest.py | 9 +-- test/pacman/util.py | 80 ++++++++++++-------- 24 files changed, 213 insertions(+), 161 deletions(-) rename ChangeLog.proto => proto/ChangeLog.proto (100%) rename PKGBUILD-split.proto => proto/PKGBUILD-split.proto (100%) rename PKGBUILD.proto => proto/PKGBUILD.proto (100%) rename proto.install => proto/proto.install (100%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] repo-add test harness
by Dave Reisner 30 Jun '11

30 Jun '11

The attached script is what I used for testing my repo-add changes, and worked out rather well. It's extremely primitive, but it does a bit of a smoke test again bash3 and bash4, which is important. I imagine that the next step might be to take a variety of .PKGINFO files and provide those as inputs for writing DB entries. This is hopefuly the next thing on my plate after I get some more work done on the download code. d

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-394-g9efd10c
by dan＠archlinux.org 30 Jun '11

30 Jun '11

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 9efd10cd2ac9a7654b2c7c94df86bf09ab54f41a (commit) via c2cce4f3f5e0381d107ced3fee3ab0d7240653d1 (commit) via ad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1 (commit) via 0f4aaeee42135d06dd18eb585eab3bae0e5fbf34 (commit) via 002d2fda7a4e7f85798684c15809d30d27dc7034 (commit) via 2860ade2f5f827c41d84bc7826444792433c8009 (commit) via 84974ed04c16218608312ccf6369cf728eada477 (commit) via c2e6a01a2897e13849e2cdc8291d862d4ea0ee44 (commit) via 4c80f994c34a64f14c46befcf7dbc376276f53d4 (commit) via e92905a2c8c14c7855e2841f44d3c139aa40844c (commit) via fed3e09c94d204b4655656c703a178e6fa2144b3 (commit) via b1894ccf062059972d39fa855ee7941b666c5db0 (commit) via f1bb56cebfda9b11ea02754d325ff659014e2caa (commit) via 9a29888ba72694ed0a8cba620387b3ee1ee39baa (commit) via 5f6e8c92741939a098bc14371fcde904fc9ed613 (commit) via 452bf71cec7a1a62bbee9d106733ad9ed398c6ee (commit) via 3bb469d558b5ad778f87a1427a45ec4190ba4155 (commit) via 7633c14bd5d8461c28ab900d3ddbec5f649932ee (commit) via 028b965e1a71aa85ba3772e20146d40d9006d8c9 (commit) via 925f42e460c2a2dd23f84d4504a14540670d1bd6 (commit) via 71fa9f912d65ff9d23d05ca42aa494d1d3f596f2 (commit) via 57b9b19b103a5d48a7116adfd546a516e121329c (commit) via 08fc1db24c9d30f63c9ac858ab2cc50f64f8e38b (commit) via ddad400900fbf253f6e247f51ef4aeb9d89d8643 (commit) via 1059df7486054c621423436b801681775a2596c3 (commit) via 565e167356c1ec56803454b2b4c617f21296fb67 (commit) via 011ef6be0e68dcf148a255c31a9a6efb7429c2f9 (commit) via 590a8fcb1e72707d83d04f639385de0d7f2a60c1 (commit) via 0aef91bc4fc5e872afe7da1692bf97c027eecf37 (commit) via cd1e39ba62ea564c1c29a918aa1a4d6aac9a351e (commit) via bfe1771067e372420d857094befd6c6ea5b28495 (commit) via 1fdbe7902219c5ed3e56b921acae4f3a58b9e76e (commit) via 37b6cceed41bc22d0d9fb1fe2f274067ddd2b2cc (commit) via 220842b37ba484a452f5e4d8071d91d3f2b6c2d4 (commit) via 6d876f9b6be055d54e50d42a34c267aad64c0b21 (commit) via 9540dfc4d9cc70266a425cc334f78d7805b2340b (commit) via 6b62508c865feaa35d000fa0bcd0ccd8321cd742 (commit) via 8a04bc25a14df93c0ca207ac83d43cdb867346a1 (commit) via 939d5a9511b2dcbb07390ecfcd23528d8034709b (commit) via 64c1cf792184661a1d3dd73329f129172e688f17 (commit) via 1c5c7c907c8cfb26c129d60d919c837ff42ca1c5 (commit) via 0a80cf31cfe960b2c62e734aef6e3c662469e917 (commit) via 7ce674491bd854610855fe83482eda6b18273fa0 (commit) from 9aab1440cacf143b62f05ccfac0e7917ef9d4c45 (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 9efd10cd2ac9a7654b2c7c94df86bf09ab54f41a Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Jun 30 17:07:54 2011 +0200 fix vim syntax highlighting of .sh files vim recognises what type of shell script it's dealing with by looking at the shebang. If detection fails it falls back to sh which doesn't support some bash features. Adding a normal, possibly broken, shebang which gets fixed by the Makefile allows vim to detect bash syntax. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2cce4f3f5e0381d107ced3fee3ab0d7240653d1 Merge: ad577b3 9a29888 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 30 10:41:49 2011 -0500 Merge remote-tracking branch 'dave/makepkg' commit ad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1 Merge: 0f4aaee fed3e09 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 30 10:37:08 2011 -0500 Merge remote-tracking branch 'allan/breakshit' commit 0f4aaeee42135d06dd18eb585eab3bae0e5fbf34 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jun 29 09:22:24 2011 -0400 lib/util: modify entry_prefix, not prefix Modifying prefix caused tmp directories to be left behind after running scriptlets, and the path '/' to be passed to _alpm_rmrf. Broken in f01c6f. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 002d2fda7a4e7f85798684c15809d30d27dc7034 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 00:22:53 2011 -0400 lib/alpm: unlock the handle before freeing it This avoids, probably among other things, leaving the lock file in place after a SIGINT'd sync DB update. Fixes regression introduced in 4f8ae2b. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2860ade2f5f827c41d84bc7826444792433c8009 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jun 28 21:32:40 2011 -0400 repo-add.sh.in: avoid being clever with repo repacking Revert to the old behavior that 6f5a90 attempted to simplify and go with the original proposed solution of using "ugly" bash to detect empty directories. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 84974ed04c16218608312ccf6369cf728eada477 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 28 19:53:12 2011 -0500 repo-add: fix db creation one last time We fubar-ed this pretty good. 1. The whole old/new move shuffle was totally busted if you used a relative path to your database, as we would just build the database in place. 2. Our prior temp directory layout had the database files extracted directly into it. When we tried to create a xxx.db.tar.gz file in this same directory, due to the fact that we were no longer using a shell wildcard, we tried to include the db in ourself, which is a big failure. Fix all this by extracting to tree/ so we can have a clean top-level temp directory. 3. Fix the inclusion of the './' directory entry; ensure the regex prunes both leading paths of '.' as well as './'. Where is that test suite again? Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2e6a01a2897e13849e2cdc8291d862d4ea0ee44 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 28 21:35:48 2011 -0500 makepkg: only source user override if using default config file Otherwise there is no way to easily test or run with a standalone config file without outside interference. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4c80f994c34a64f14c46befcf7dbc376276f53d4 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Tue Jun 28 08:22:57 2011 +0200 makepkg: fix typo (missing quotes) Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e92905a2c8c14c7855e2841f44d3c139aa40844c Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 22:47:35 2011 +1000 makepkg: fix removing symbolic link The path was not being stripped from $file before prefixing with $srcdir resulting in the attempted removal of a very weird filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fed3e09c94d204b4655656c703a178e6fa2144b3 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 29 15:59:48 2011 +1000 Use ignoregroup rather than ignoregrp in the handle This matches the naming in pacman.conf. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b1894ccf062059972d39fa855ee7941b666c5db0 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 29 15:52:33 2011 +1000 Rename internal functions with grp in their name The following function renames take place for the same reasoning as the previous commit: _alpm_grp_new -> _alpm_group_new _alpm_grp_free -> _alpm_group_free _alpm_db_free_grpcache -> _alpm_db_free_groupcache _alpm_db_get_grpfromcache -> _alpm_db_get_groupfromcache Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f1bb56cebfda9b11ea02754d325ff659014e2caa Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 29 15:46:49 2011 +1000 Rename public functions with grp in their name Using grp instead of group is a small saving at the cost of clarity. Rename the following functions: alpm_option_get_ignoregrps -> alpm_option_get_ignoregroups alpm_option_add_ignoregrp -> alpm_option_add_ignoregroup alpm_option_set_ignoregrps -> alpm_option_set_ignoregroups alpm_option_remove_ignoregrp -> alpm_option_remove_ignoregroup alpm_db_readgrp -> alpm_db_readgroup alpm_db_get_grpcache -> alpm_db_get_groupcache alpm_find_grp_pkgs -> alpm_find_group_pkgs Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9a29888ba72694ed0a8cba620387b3ee1ee39baa Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 28 22:36:41 2011 -0400 makepkg: simplify SIGNPKG check Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 5f6e8c92741939a098bc14371fcde904fc9ed613 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 28 22:35:44 2011 -0400 makepkg: fix vim syntax highlighting Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 452bf71cec7a1a62bbee9d106733ad9ed398c6ee Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 28 22:35:10 2011 -0400 makepkg: remove unneeded echo Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 3bb469d558b5ad778f87a1427a45ec4190ba4155 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 15:31:21 2011 +1000 Update README with changes to struct names Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7633c14bd5d8461c28ab900d3ddbec5f649932ee Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 15:00:46 2011 +1000 Rename _pmdbstatus_t to _alpm_dbstatus_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 028b965e1a71aa85ba3772e20146d40d9006d8c9 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:59:04 2011 +1000 Rename pmdbinfrq_t to alpm_dbinfrq_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 925f42e460c2a2dd23f84d4504a14540670d1bd6 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:57:47 2011 +1000 Rename pmtransstate_t to alpm_transstate_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 71fa9f912d65ff9d23d05ca42aa494d1d3f596f2 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:56:29 2011 +1000 Rename pmpkghash_t to alpm_pkghash_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 57b9b19b103a5d48a7116adfd546a516e121329c Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:54:19 2011 +1000 Rename pmgraph_t to alpm_graph_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 08fc1db24c9d30f63c9ac858ab2cc50f64f8e38b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:52:50 2011 +1000 Rename pmpkgfrom_t to alpm_pkgfrom_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ddad400900fbf253f6e247f51ef4aeb9d89d8643 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:50:48 2011 +1000 Rename pmerrno_t to alpm_errno_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1059df7486054c621423436b801681775a2596c3 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:48:50 2011 +1000 Rename pmtransprog_t to alpm_transprog_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 565e167356c1ec56803454b2b4c617f21296fb67 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:46:58 2011 +1000 Rename pmtransconv_t to alpm_transconv_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 011ef6be0e68dcf148a255c31a9a6efb7429c2f9 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:43:48 2011 +1000 Rename pmtransevt_t to alpm_transevt_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 590a8fcb1e72707d83d04f639385de0d7f2a60c1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:42:24 2011 +1000 Rename pmtransflag_t to alpm_transflag_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0aef91bc4fc5e872afe7da1692bf97c027eecf37 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:41:07 2011 +1000 Rename pmloglevel_t to alpm_loglevel_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd1e39ba62ea564c1c29a918aa1a4d6aac9a351e Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:39:43 2011 +1000 Rename pmbackup_t to alpm_backup_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bfe1771067e372420d857094befd6c6ea5b28495 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:38:38 2011 +1000 Rename pmdelta_t to alpm_delta_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1fdbe7902219c5ed3e56b921acae4f3a58b9e76e Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:37:16 2011 +1000 Rename pmgrp_t to alpm_group_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 37b6cceed41bc22d0d9fb1fe2f274067ddd2b2cc Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:35:17 2011 +1000 Rename pmfileconflict_t to alpm_fileconflict_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 220842b37ba484a452f5e4d8071d91d3f2b6c2d4 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:33:55 2011 +1000 Rename pmconflict_t to alpm_conflict_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6d876f9b6be055d54e50d42a34c267aad64c0b21 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:32:09 2011 +1000 Rename pmdepmissing_t to alpm_depmissing_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9540dfc4d9cc70266a425cc334f78d7805b2340b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:29:55 2011 +1000 Rename pmdepend_t to alpm_depend_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6b62508c865feaa35d000fa0bcd0ccd8321cd742 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 23:27:16 2011 +1000 Rename pmtrans_t to alpm_trans_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8a04bc25a14df93c0ca207ac83d43cdb867346a1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 23:26:39 2011 +1000 Rename pmpkg_t to alpm_pkg_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 939d5a9511b2dcbb07390ecfcd23528d8034709b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:11:43 2011 +1000 Rename pmdb_t to alpm_db_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 64c1cf792184661a1d3dd73329f129172e688f17 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:04:00 2011 +1000 Rename pmhandle_t to alpm_handle_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1c5c7c907c8cfb26c129d60d919c837ff42ca1c5 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 13:58:59 2011 +1000 Rename pmfileconflicttype_t to alpm_fileconflicttype_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0a80cf31cfe960b2c62e734aef6e3c662469e917 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 13:56:46 2011 +1000 Rename pmdepmod_t to alpm_depmod_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7ce674491bd854610855fe83482eda6b18273fa0 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 13:54:04 2011 +1000 Rename pmpkgreason_t to alpm_pkgreason_t Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 4 +- contrib/Makefile.am | 2 +- contrib/bacman.in | 2 +- contrib/pacdiff.in | 2 +- contrib/pacscripts.in | 2 +- lib/libalpm/add.c | 34 ++-- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 13 +- lib/libalpm/alpm.h | 356 +++++++++++++++++++------------------- lib/libalpm/backup.c | 16 +- lib/libalpm/backup.h | 8 +- lib/libalpm/be_local.c | 82 +++++----- lib/libalpm/be_package.c | 30 ++-- lib/libalpm/be_sync.c | 34 ++-- lib/libalpm/conflict.c | 62 ++++---- lib/libalpm/conflict.h | 12 +- lib/libalpm/db.c | 110 ++++++------ lib/libalpm/db.h | 62 ++++---- lib/libalpm/delta.c | 68 ++++---- lib/libalpm/delta.h | 8 +- lib/libalpm/deps.c | 136 ++++++++-------- lib/libalpm/deps.h | 16 +- lib/libalpm/diskspace.c | 18 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 6 +- lib/libalpm/dload.h | 4 +- lib/libalpm/error.c | 4 +- lib/libalpm/graph.c | 8 +- lib/libalpm/graph.h | 8 +- lib/libalpm/group.c | 8 +- lib/libalpm/group.h | 4 +- lib/libalpm/handle.c | 120 +++++++------- lib/libalpm/handle.h | 22 ++-- lib/libalpm/log.c | 4 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 158 +++++++++--------- lib/libalpm/package.h | 86 +++++----- lib/libalpm/pkghash.c | 36 ++-- lib/libalpm/pkghash.h | 18 +- lib/libalpm/remove.c | 48 +++--- lib/libalpm/remove.h | 8 +- lib/libalpm/signing.c | 12 +- lib/libalpm/signing.h | 4 +- lib/libalpm/sync.c | 110 ++++++------ lib/libalpm/sync.h | 4 +- lib/libalpm/trans.c | 38 ++-- lib/libalpm/trans.h | 20 +- lib/libalpm/util.c | 16 +- lib/libalpm/util.h | 18 +- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 21 +-- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 2 +- scripts/repo-add.sh.in | 29 ++-- src/pacman/callback.c | 10 +- src/pacman/callback.h | 8 +- src/pacman/conf.c | 10 +- src/pacman/conf.h | 4 +- src/pacman/database.c | 4 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 14 +- src/pacman/package.h | 8 +- src/pacman/query.c | 40 +++--- src/pacman/remove.c | 14 +- src/pacman/sync.c | 84 +++++----- src/pacman/upgrade.c | 12 +- src/pacman/util.c | 40 +++--- src/pacman/util.h | 14 +- src/util/cleanupdelta.c | 10 +- src/util/pactree.c | 18 +- src/util/testdb.c | 14 +- src/util/testpkg.c | 8 +- 75 files changed, 1115 insertions(+), 1108 deletions(-) hooks/post-receive -- The official pacman repository

1 0