- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] PKGBUILD.vim: add special licenses BSD MIT ZLIB Python
by Xavier Chantry 23 Oct '10

23 Oct '10

Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- contrib/PKGBUILD.vim | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index c2b6045..a50ca12 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -67,10 +67,13 @@ syn match pbUrlGroup /^url=.*/ contains=pbValidUrl,pb_k_url,pbIllegalUrl,shDoubl " license syn keyword pb_k_license license contained -syn keyword pbLicense APACHE CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PHP PSF PerlArtistic RALINK RUBY ZPL 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 pbLicenseSpecial BSD MIT ZLIB Python contained syn match pbLicenseCustom /custom$:[[:alnum:]]*$*/ contained -syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense -syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense +syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicenseSpecial,pbLicense +syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicenseSpecial,pbLicense,pbIllegalLicense " backup syn keyword pb_k_backup backup contained -- 1.7.3.2

1 0

[pacman-dev] Swedish translations, again
by Tobias Eriksson 20 Oct '10

20 Oct '10

Gah, sent to wrong list :) Anyways.. Hi all! If you remember, a couple of months ago I sent in patches for the Swedish language files for pacman. Well, I'm sending a new patch, hopefully with better translations this time around :) As usual, feedback is more than welcome, and I'll try to fix any problems that come up! /Tobias

1 0

[pacman-dev] [RFC] New attempt at a better interface for adding/removing target
by Xavier Chantry 19 Oct '10

19 Oct '10

See http://code.toofishes.net/cgit/xavier/pacman.git/commit/?h=working&id=eeab3… ================================== alpm: deprecate old interface Old interface is marked as deprecated: int alpm_sync_target(char *target); int alpm_sync_dbtarget(char *db, char *target); int alpm_add_target(char *target); int alpm_remove_target(char *target); New recommended interface: int alpm_add_pkg(pmpkg_t *pkg); int alpm_remove_pkg(pmpkg_t *pkg); ================================== Having interfaces dealing directly with pmpkg_t is more powerful and more accurate. Also see http://mailman.archlinux.org/pipermail/pacman-dev/2009-June/008847.html However it's probably also less safe for bad frontends trying to do stupid things and trying to pass invalid or outdated pmpkg. I am not sure what the consequences could be, it might need some more thinking and a few sanity checks. I unified sync_pkg and add_pkg, however there was a slight behavior difference between them, which should be fixed. http://code.toofishes.net/cgit/xavier/pacman.git/commit/?h=working&id=fca9e… ================================== pacman/upgrade: switch to new interface Note that there is a behavior change here : if the same package name appeared several times in the target list, the alpm_add_target interface chooses the new package, while alpm_add_pkg returns PKG_DUP. I don't see why we cannot unify the behavior of -S and -U, and just choose one behavior that applies to both. Otherwise, it's always possible to handle these different behaviors in the frontend, it just requires more work. ================================== I just picked the two commits I found most relevant and for which I saw some possible concerns, but there are ~10 commits related to this interface rework on my branch.

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-11-g30734c9
by dan＠archlinux.org 18 Oct '10

18 Oct '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 30734c9a4a63a1bfac0921b944e84f24dc87d76f (commit) via a2d7f6f2061fdf0ff225eaceda5c78ee520495ff (commit) from 3a06a9fa9fafe705bfb79c23dd75ca226b22026c (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/remove.c | 4 ++++ lib/libalpm/sync.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-139-g0f3957a
by dan＠archlinux.org 18 Oct '10

18 Oct '10

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 0f3957ab48f34df8e151ec026dfac0d9d2df5aec (commit) via ce96f39ac9313a3583f346adfd2c709a658fae58 (commit) via 8f2eaa51c2705a066da3d18af287ec6e0d80c032 (commit) via 9d0b33fd3327ae6d2b15f50870c0885a2068d492 (commit) via 30734c9a4a63a1bfac0921b944e84f24dc87d76f (commit) via a2d7f6f2061fdf0ff225eaceda5c78ee520495ff (commit) via 7237903c66af3997ac754df70cc8d25cefc8d1ae (commit) via f5059038f2bd5eb30ccc8ec2ef55923896437906 (commit) from de5f438aef1dd11c68658683996deab2b0714e0e (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 0f3957ab48f34df8e151ec026dfac0d9d2df5aec Merge: ce96f39 30734c9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 18 16:52:57 2010 -0500 Merge branch 'maint' commit ce96f39ac9313a3583f346adfd2c709a658fae58 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 12:16:03 2010 +0200 pactest: use valgrind.supp file Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f2eaa51c2705a066da3d18af287ec6e0d80c032 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Sep 24 14:31:31 2010 +0200 Tests: '-S repo/group' syntax when calling '-S repo/group', only group members in <repo> should should be installed (group members in other repos are ignored) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9d0b33fd3327ae6d2b15f50870c0885a2068d492 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Sep 24 14:22:35 2010 +0200 Tests: Sync group which includes ignored pkgs * FS#19854 (--ignore is ignored with groups) * http://www.archlinux.org/pipermail/pacman-dev/2009-June/008847.html (operation aborts when a package from a group is ignored/and user chooses not to install it) If a group member is ignored, we expect a) a question whether to install b) after saying 'no' to a), the ignored member not to be installed c) all other group members to be installed d) pacman to execute successfully Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7237903c66af3997ac754df70cc8d25cefc8d1ae Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Thu Oct 14 19:54:13 2010 +0200 be_package: read force entry and convert to epoch We still need to read force entry in epoch-aware pacman, so that when we install an old force package, EPOCH gets written to the local db. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f5059038f2bd5eb30ccc8ec2ef55923896437906 Author: Carlos Diaz <839273(a)gmail.com> Date: Wed Oct 13 00:16:35 2010 -0430 bash_completion: remove upstream deprecated functions Populate $cur and $prev with the new bash-completion 1.2 function, _get_comp_words_by_ref. _get_cword and _get_pword have been deprecated. Signed-off-by: Carlos Diaz <839273(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 6 ++---- lib/libalpm/be_package.c | 5 +++++ lib/libalpm/remove.c | 4 ++++ lib/libalpm/sync.c | 4 +++- test/pacman/pmtest.py | 2 +- test/pacman/tests/ignore007.py | 23 +++++++++++++++++++++++ test/pacman/tests/sync024.py | 23 +++++++++++++++++++++++ 7 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 test/pacman/tests/ignore007.py create mode 100644 test/pacman/tests/sync024.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add a PKGBUILD-python prototype
by Dimitri Merejkowsky 16 Oct '10

16 Oct '10

Signed-off-by: Dimitri Merejkowsky <yannicklm1337(a)gmail.com> --- Makefile.am | 2 +- PKGBUILD-python.proto | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletions(-) create mode 100644 PKGBUILD-python.proto diff --git a/Makefile.am b/Makefile.am index 32a08f7..3a4c81c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ EXTRA_DIST = HACKING # Sample makepkg prototype files pkgdatadir = ${datadir}/${PACKAGE} -dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto proto.install ChangeLog.proto +dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto PKGBUILD-python.proto proto.install ChangeLog.proto # run the pactest test suite and vercmp tests check-local: test/pacman test/util src/pacman src/util diff --git a/PKGBUILD-python.proto b/PKGBUILD-python.proto new file mode 100644 index 0000000..23aada7 --- /dev/null +++ b/PKGBUILD-python.proto @@ -0,0 +1,40 @@ +# This is an example PKGBUILD file for installing a python module +# Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME +pkgver=VERSION +pkgrel=1 +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=(python) +makedepends=(python) +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=($pkgname-$pkgver.tar.gz) +noextract=() +md5sums=() #generate with 'makepkg -g' + +build() { + cd "$srcdir/$pkgname-$pkgver" + python setup.py build +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python setup.py install --root=$pkgdir +} + +# vim:set ts=2 sw=2 et: -- 1.7.3.1

3 2

[pacman-dev] [PATCH 0/5] RFC: epoch implementation
by Dan McGee 15 Oct '10

15 Oct '10

Hey guys, This is a quick set of patches to implement the use of epoch in our packages, and remove the 'force' option. It adds a lot more flexibility and should prevent weird upgrade/downgrade interaction between different repositories, and also removes the need to munge versions as often. The pacman stuff is pretty well tested via the current suite of pactests, although we will want to add some new tests specifically playing with the epoch value in the test packages. Anyway, thoughts/comments/suggestions welcome. The changes are not too invasive and the only real complexity comes from trying to remain backward and forward compatible. This addresses bugs such as FS#14887, FS#19153, FS#19639 along with many a conversation we've had in the past on this list. -Dan Dan McGee (5): Add epoch support to pacman/libalpm Update documentation to reflect new epoch package variable Make repo-add and makepkg epoch-aware Add epoch support to pactest Update contrib/ for epoch contrib/PKGBUILD.vim | 10 ++++++++-- contrib/bacman | 3 +++ doc/PKGBUILD.5.txt | 22 ++++++++++++---------- doc/pacman.8.txt | 3 +++ lib/libalpm/alpm.h | 2 +- lib/libalpm/be_files.c | 16 +++++++++++++--- lib/libalpm/be_package.c | 2 ++ lib/libalpm/package.c | 24 ++++++++++++++---------- lib/libalpm/package.h | 2 +- scripts/makepkg.sh.in | 6 ++---- scripts/repo-add.sh.in | 7 ++++++- test/pacman/pmdb.py | 18 +++++++----------- test/pacman/pmpkg.py | 5 +++-- test/pacman/util.py | 4 ++++ 14 files changed, 79 insertions(+), 45 deletions(-) -- 1.7.3.1

4 16

Re: [pacman-dev] [PATCH 1/3] makepkg: fallback to legacy termcap capabilities
by Nezmer 14 Oct '10

14 Oct '10

Sent this to Andres, forwarding... ----- Forwarded message from Nezmer <git(a)nezmer.info> ----- Date: Thu, 14 Oct 2010 20:34:15 +0300 From: Nezmer <git(a)nezmer.info> To: Andres Perera <andres.p(a)zoho.com> Subject: Re: [pacman-dev] [PATCH 1/3] makepkg: fallback to legacy termcap capabilities User-Agent: Mutt/1.5.20 (2009-06-14) On Thu, Oct 14, 2010 at 12:47:02PM -0430, Andres Perera wrote: > On Thu, Oct 14, 2010 at 12:41 PM, Nezmer <git(a)nezmer.info> wrote: > > If you're running FreeBSD. The default $TERM in ttyv<int> is cons25(1) and > > it can handle the colours just fine. So I don't know how the hard-coded > > list is relevant. > > > > (1) I heard this vintage default will change soon. > > There's really no stopping at that point; the default terminal in OpenBSD is > "vt220" and it can handle colors, so can Linux's "linux" terminal. > > So it's screwing some terminals up vs. replicating ncurses in Bash -- since > that's exactly what ncurses does, it looks at the TERM string and compares it > to a list. Once this "vintage" changes, I guess makepkg is supposed to be > updated, if the second option is any good. > > Are you proposing that it should check for all these terminals or just grant > these bonuses to those who link against terminfo? First of all, Don't assume I know what I'm talking about. If I say something stupid, please correct me. Currently, makepkg with colours work just fine in FreeBSD's default cons25 term. The patch will assume cons25 can't handle colours and will disable them, right? So, from a user prospective. This does not improve the experience in FreeBSD. Feel free to shout at my stupidity. * PS: xterm is the new default in 9-CURRENT. Hopefully It will make it to STABLE soon If It didn't already. ----- End forwarded message -----

4 6

[pacman-dev] [PATCH 1/3] makepkg: fallback to legacy termcap capabilities
by Carlos Diaz 14 Oct '10

14 Oct '10

In some systems, such as Freebsd, the base tput isn't linked against a terminfo capable ncurses. This means that there's no portable way to set color, so instead of guessing, makepkg fallbacks on using legacy termcap output manipulation. For reference, see terminfo(5) and termcap(5) for a comparison between the abilities. The hardcoded list of terminals is taken from freebsdports/shells/tcshrc and tmux [1]. This prevents echoing gibberish in dumb and otherwise incapacitated terminals. 1: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/tmux/tty.c?rev=1.91;conte… Signed-off-by: Carlos Diaz <839273(a)gmail.com> --- scripts/makepkg.sh.in | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bdf63ef..3d29d26 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1660,21 +1660,30 @@ PACMAN=${PACMAN:-pacman} # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then - # prefer terminal safe colored and bold text when tput is supported if tput setaf 0 &>/dev/null; then + # tput linked against a compliant terminfo ncurses ALL_OFF="$(tput sgr0)" BOLD="$(tput bold)" BLUE="${BOLD}$(tput setaf 4)" GREEN="${BOLD}$(tput setaf 2)" RED="${BOLD}$(tput setaf 1)" YELLOW="${BOLD}$(tput setaf 3)" - else + elif [[ $TERM =~ ^(dtterm|rxvt|screen|xterm) ]]; then + # no terminfo, but don't fallback to ugly reverse text just yet ALL_OFF="\033[1;0m" BOLD="\033[1;1m" BLUE="${BOLD}\033[1;34m" GREEN="${BOLD}\033[1;32m" RED="${BOLD}\033[1;31m" YELLOW="${BOLD}\033[1;33m" + elif tput me &>/dev/null; then + # rely on termcap capabilities; no portable way of using color + ALL_OFF="$(tput me)" + BOLD="$(tput md)" + BLUE="$(tput mr)" # reverse + GREEN="$(tput us)" # underline + RED="$(tput so)" # standout + YELLOW="$(tput mh)" # half-bright fi fi readonly ALL_OFF BOLD BLUE GREEN RED YELLOW -- 1.7.3.1

5 10

[pacman-dev] [PATCH 1/4] CLI args: add pactest with an invalid combination
by Xavier Chantry 14 Oct '10

14 Oct '10

From: Jakob Gruber <jakob.gruber(a)gmail.com> Pacman should catch cases in which the passed arguments don't apply to the current operation (sync/query/...) Also see FS#20950 --- test/pacman/tests/pacman005.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/pacman005.py diff --git a/test/pacman/tests/pacman005.py b/test/pacman/tests/pacman005.py new file mode 100644 index 0000000..99c25b2 --- /dev/null +++ b/test/pacman/tests/pacman005.py @@ -0,0 +1,11 @@ +self.description = "Test invalid combination of command line options (-Qy)" + +p = pmpkg("foobar") +self.addpkg2db("local", p) + +self.args = "-Qy" + +self.addrule("PACMAN_RETCODE=1") + +self.expectfailure = True + -- 1.7.3.1

4 15

[pacman-dev] [PATCH 1/3] add 4 pactests for -Sdd
by Xavier Chantry 14 Oct '10

14 Oct '10

Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- test/pacman/tests/sync-sdd1.py | 18 ++++++++++++++++++ test/pacman/tests/sync-sdd2.py | 15 +++++++++++++++ test/pacman/tests/sync-sdd3.py | 15 +++++++++++++++ test/pacman/tests/sync-sdd4.py | 17 +++++++++++++++++ 4 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/sync-sdd1.py create mode 100644 test/pacman/tests/sync-sdd2.py create mode 100644 test/pacman/tests/sync-sdd3.py create mode 100644 test/pacman/tests/sync-sdd4.py diff --git a/test/pacman/tests/sync-sdd1.py b/test/pacman/tests/sync-sdd1.py new file mode 100644 index 0000000..4438ef0 --- /dev/null +++ b/test/pacman/tests/sync-sdd1.py @@ -0,0 +1,18 @@ +self.description = "-Sdd: -Sdd works" + +p1 = pmpkg("pkg1", "1.0-2") +p1.depends = ["provision>1.0-1"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2", "1.0-2") +p2.provides = ["provision=1.0-1"] +self.addpkg2db("sync", p2) + +self.args = "-Sdd %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_DEPENDS=pkg1|provision>1.0-1") + +self.expectfailure = True diff --git a/test/pacman/tests/sync-sdd2.py b/test/pacman/tests/sync-sdd2.py new file mode 100644 index 0000000..5f1f847 --- /dev/null +++ b/test/pacman/tests/sync-sdd2.py @@ -0,0 +1,15 @@ +self.description = "-Sdd: -S fails" + +p1 = pmpkg("pkg1", "1.0-2") +p1.depends = ["provision>=1.0-2"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2", "1.0-2") +p2.provides = ["provision=1.0-1"] +self.addpkg2db("sync", p2) + +self.args = "-S %s" % p1.name + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") diff --git a/test/pacman/tests/sync-sdd3.py b/test/pacman/tests/sync-sdd3.py new file mode 100644 index 0000000..68733af --- /dev/null +++ b/test/pacman/tests/sync-sdd3.py @@ -0,0 +1,15 @@ +self.description = "-Sdd: -Sd works but no deps" + +p1 = pmpkg("pkg1", "1.0-2") +p1.depends = ["provision>=1.0-2"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2", "1.0-2") +p2.provides = ["provision=1.0-1"] +self.addpkg2db("sync", p2) + +self.args = "-Sd %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") diff --git a/test/pacman/tests/sync-sdd4.py b/test/pacman/tests/sync-sdd4.py new file mode 100644 index 0000000..4cd4b54 --- /dev/null +++ b/test/pacman/tests/sync-sdd4.py @@ -0,0 +1,17 @@ +self.description = "-Sdd: provision does not exist" + +p1 = pmpkg("pkg1", "1.0-2") +p1.depends = ["invalid>=1.0-2"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2", "1.0-2") +p2.provides = ["provision=1.0-1"] +self.addpkg2db("sync", p2) + +self.args = "-Sdd %s" % p1.name + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") + +self.expectfailure = True -- 1.7.3.1

1 2

[pacman-dev] [PATCH] bash_completion: remove upstream deprecated functions
by Carlos Diaz 14 Oct '10

14 Oct '10

Populate $cur and $prev with the new bash-completion 1.2 function, _get_comp_words_by_ref. _get_cword and _get_pword have been deprecated. Signed-off-by: Carlos Diaz <839273(a)gmail.com> --- contrib/bash_completion.in | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index bdc4754..7f47f4b 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -30,8 +30,7 @@ _arch_incomp() { _makepkg() { local cur opts prev COMPREPLY=() - cur=$(_get_cword) - prev=${COMP_WORDS[COMP_CWORD-1]} + _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(cleancache|config|help)$|\w*[Chp]) ]]; then opts=('allsource asroot clean cleancache config force geninteg help holdver ignorearch install log nobuild nocolor noconfirm nodeps noextract @@ -55,8 +54,7 @@ _pacman_pkg() { _pacman() { local common core cur database prev query remove sync upgrade o COMPREPLY=() - cur=$(_get_cword) - prev=${COMP_WORDS[COMP_CWORD-1]} + _get_comp_words_by_ref cur prev database=('asdeps asexplicit') query=('changelog check deps explicit file foreign groups info list owns search unrequired upgrades' 'c e g i k l m o p s t u') -- 1.7.3.1

3 2

Re: [pacman-dev] Contributing BSD patches upstream
by Dan McGee 14 Oct '10

14 Oct '10

On Wed, Oct 6, 2010 at 6:38 AM, Nezmer <me(a)nezmer.info> wrote: > On Tue, Oct 05, 2010 at 07:56:53PM -0500, Dan McGee wrote: >> On Tue, Oct 5, 2010 at 6:03 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: >> > Hey, >> > >> > I noticed you did some merges and updates on your pacman-bsd branch >> > today (http://gitorious.org/pacman-bsd/pacman-bsd) Have you thought >> > about trying to get some of this work into the main branch of code so >> > you don't have to maintain as much? I know we've already taken in a >> > few things, like the makepkg colors checking stuff, but it might be >> > nice to ensure we are as portable as possible out of the box. >> > >> > I CC-ed in Allan because a lot of these are touchups to makepkg. I >> > know we may not seem to move quickly at times, but we do appreciate >> > patches and contributions from others. >> >> My quick review of the differences picked out these things as stuff >> that should/could be looked at to improve compatibility and >> correctness: >> >> 1. DBPath/CacheDir parsing in scripts/ and contrib/ >> 2. Fix bash regexes: =~ should never have RHS quotes >> 3. Hardcoded '.tar.gz' in some contrib/ scripts >> 4. contrib/, use configurable etc/ directory (sysconfdir I believe) >> 5. bsdtar binary location, don't assume it is on path? >> 6. Use of seq (not a bash builtin) >> 7. makepkg: strip binary location hardcoded, perhaps use $STRIP >> 8. makepkg: mknod vs. mkfifo >> 9. bash shebang in scripts >> >> -Dan > > Just saw this. A very good summary. > > I'm welling to answer any questions or put together any patch you are > interested to take. I'd basically say anything that is in the above list is fair game for patches. #2 and #3 are pretty low-hanging, non-invasive stuff if you'd like somewhere to start. I think I just handled #6 as we only used it in one contrib script; patch going to the ML. This message is also going to the ML so we can maybe get some discussion going there. -Dan

4 6

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-9-g3a06a9f
by dan＠archlinux.org 14 Oct '10

14 Oct '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 3a06a9fa9fafe705bfb79c23dd75ca226b22026c (commit) from 283ef6519aa20b8c63c9b916573b5f243ff7be2e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_package.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-131-gde5f438
by dan＠archlinux.org 14 Oct '10

14 Oct '10

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 de5f438aef1dd11c68658683996deab2b0714e0e (commit) via 73886504d7fa62e8cb49631fb13b53ea69919a3f (commit) via 93718046d79b58df4b90956d9fb4e2282071f62c (commit) via 0d5fa576b3ed011d091b87d84b79db794b37320c (commit) via 8aa7ed5a7e82eaa40c2ee68271226787710f8f08 (commit) via 6f37ba61ed79876b23d3328185186d9ac0c3332c (commit) via 42893e7165e3db0bf068611d5a4164926adcf43a (commit) via feb9889f22639c214606dcb387af6d0a51ea5e85 (commit) via 3a06a9fa9fafe705bfb79c23dd75ca226b22026c (commit) from ef32aa0219146866b7f7e55c95afc327819dd6cf (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 de5f438aef1dd11c68658683996deab2b0714e0e Merge: 7388650 3a06a9f Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 13 23:42:35 2010 -0500 Merge branch 'maint' commit 73886504d7fa62e8cb49631fb13b53ea69919a3f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 11 17:39:41 2010 -0500 Add several pactests for epoch code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 93718046d79b58df4b90956d9fb4e2282071f62c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 11 17:18:05 2010 -0500 Add epoch verification to makepkg If defined, it must be an integer. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0d5fa576b3ed011d091b87d84b79db794b37320c Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 8 08:59:02 2010 -0500 Update contrib/ for epoch Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8aa7ed5a7e82eaa40c2ee68271226787710f8f08 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 8 09:53:10 2010 -0500 Add epoch support to pactest This adds epoch support to pactest, while still producing packages and database entries the same way makepkg and repo-add currently do in a backward compatible fashion (still including the 'force' option). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f37ba61ed79876b23d3328185186d9ac0c3332c Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 8 09:44:22 2010 -0500 Make repo-add and makepkg epoch-aware Allow it to be a variable in the PKGBUILD as well as propagating it through to the built package and the package database. We leave some backward compatibility in place by placing the '%FORCE%' option in the database if the package contains an epoch; this will be used by older versions of pacman and more or less ignored by versions that use epoch. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 42893e7165e3db0bf068611d5a4164926adcf43a Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 8 08:52:14 2010 -0500 Update documentation to reflect new epoch package variable Signed-off-by: Dan McGee <dan(a)archlinux.org> commit feb9889f22639c214606dcb387af6d0a51ea5e85 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 8 08:39:23 2010 -0500 Add epoch support to pacman/libalpm This will allow for better control of what was previously the 'force' option in a PKGBUILD and transferred into the built package. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.vim | 10 +++++++- contrib/bacman.in | 3 ++ doc/PKGBUILD.5.txt | 22 +++++++++++--------- doc/pacman.8.txt | 3 ++ lib/libalpm/alpm.h | 2 +- lib/libalpm/be_local.c | 22 ++++++++++++++----- lib/libalpm/be_package.c | 2 + lib/libalpm/be_sync.c | 11 +++++++++- lib/libalpm/package.c | 28 ++++++++++++++----------- lib/libalpm/package.h | 4 +- scripts/makepkg.sh.in | 11 ++++++--- scripts/repo-add.sh.in | 7 +++++- test/pacman/pmdb.py | 18 ++++++---------- test/pacman/pmpkg.py | 5 ++- test/pacman/tests/{sync136.py => sync140.py} | 8 ++---- test/pacman/tests/{sync137.py => sync141.py} | 5 +-- test/pacman/tests/sync142.py | 14 +++++++++++++ test/pacman/tests/sync143.py | 18 ++++++++++++++++ test/pacman/util.py | 4 +++ 19 files changed, 137 insertions(+), 60 deletions(-) copy test/pacman/tests/{sync136.py => sync140.py} (60%) copy test/pacman/tests/{sync137.py => sync141.py} (72%) create mode 100644 test/pacman/tests/sync142.py create mode 100644 test/pacman/tests/sync143.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-122-gef32aa0
by dan＠archlinux.org 14 Oct '10

14 Oct '10

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 ef32aa0219146866b7f7e55c95afc327819dd6cf (commit) via 68b50c81c79bcf01db0fd66ff523f32cc0dc67e9 (commit) via 24d77291da93fcd5d09df2b1d1d05474616f18a5 (commit) via 5b17d8f27d9a490a461eb2946f7c209d42c5762e (commit) via fbcadebcab57d59e460368fb6ed48bba0bbfb8a1 (commit) via d39248120e4b30e56fe052dcf5973e16e482975e (commit) via e464339e3bd37e9bdb2c8d13fa29408a1123f620 (commit) via 448f78c067955d617c302f322a2dc6507cb6eb13 (commit) via 5717c7d508db463ec178a83e852dc5e89212bd15 (commit) via 149ab6b2723c41954b638cd603e5d4ac392c8659 (commit) via 4a8e396a58219fcc6d906ce7c2bb4c4b904bd64c (commit) via 5e61f077357de1767efada259aeb824bcbfe0086 (commit) via fc32faaa6ab4081e2046b2a81e4f9949af2f7282 (commit) via 5b2de3d8ecceea0eed3124e50792400adce4e95a (commit) via 6eedf06fcc224648155bc5253d6fe1975be8da00 (commit) via 96e277cfd935d680d6309311260fe79567324e9c (commit) via 0909a72000b03332c5203b16b6a4e862c0662e03 (commit) via c56b576f6fef464f82f425219ef386fe8b742899 (commit) via efbae3cfcbd8e401084cb26853bbe46120daea4d (commit) via 522ef5e981580a52ee0ffa37178d7ddf116ebd51 (commit) via b9a531c2d7e3eefab5d987d83a1cb869e1220fac (commit) via 6cebd4e6028f717663cda0af1221f3ac74d5ab9f (commit) via d1126db1281596ba8ea960bfa963e86731d28b5e (commit) via 49176461a6b476e673e232075c95f07963750f74 (commit) via a7dc3875f15f9600e011c313c8846de6af3a2c8c (commit) from 5fcb005ebd270c1ecff3403695680145253961a2 (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 ef32aa0219146866b7f7e55c95afc327819dd6cf Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 13 23:09:20 2010 -0500 Small tweaks after backend merge Just a few small things I noticed looking through the code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68b50c81c79bcf01db0fd66ff523f32cc0dc67e9 Merge: 6eedf06 24d7729 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 13 22:46:04 2010 -0500 Merge remote branch 'allan/backend' commit 24d77291da93fcd5d09df2b1d1d05474616f18a5 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 13 21:18:03 2010 +1000 Only write to local repos We do not write to sync repos so kill the code for that. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5b17d8f27d9a490a461eb2946f7c209d42c5762e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 15:10:26 2010 +1000 Clean-up parsing sync database Remove unnecessary parsing of fields not found in sync desc file. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fbcadebcab57d59e460368fb6ed48bba0bbfb8a1 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 15:06:10 2010 +1000 Clean-up parsing local database Remove unnecessary parsing of fields not found in local desc files. Leave %FORCE% parsing as this likely will make an appearance in desc files in the future. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d39248120e4b30e56fe052dcf5973e16e482975e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 14:57:16 2010 +1000 Remove lazy loading of deltas Local packages do not have deltas so remove lazy loading of delta information. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e464339e3bd37e9bdb2c8d13fa29408a1123f620 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 14:05:07 2010 +1000 Move and rename splitname The splitname function is a general utility function and so is better suited to util.h. Rename it to _alpm_splitname to indicate it is an internal libalpm function as was the case prior to splitting local and sync db handling. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 448f78c067955d617c302f322a2dc6507cb6eb13 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 13:47:18 2010 +1000 Restrict visibility of checkdbdir and get_pkgpath These functions are only needed by be_local and were only promoted to db.{h,c} as part of the splitting of handling the local and sync dbs. Move them into be_local.c and make them static again. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5717c7d508db463ec178a83e852dc5e89212bd15 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 10 00:52:50 2010 +1000 Clean up all old database files and directories Clean-up the previous download location of the sync database and any old extracted sync database directories which are unneeded with the tar-db backend. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 149ab6b2723c41954b638cd603e5d4ac392c8659 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 10 15:25:45 2010 +1000 Only download sync databases As the sync databases are read directly from the tarball, we no longer need to extract them. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4a8e396a58219fcc6d906ce7c2bb4c4b904bd64c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 10 14:49:10 2010 +1000 Parse sync database Read in package information for a tar based sync database. Do not use lazy loading for sync db. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5e61f077357de1767efada259aeb824bcbfe0086 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 9 23:31:29 2010 +1000 Populate sync db from archive Read in list of packages for sync db from tar archive. Breaks reading in _alpm_sync_db_read and a lot of pactests (which is expected as they do not handle sync db in archives...). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fc32faaa6ab4081e2046b2a81e4f9949af2f7282 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 9 20:16:15 2010 +1000 Completely separate local and sync db handling Put the db_operations struct to use and completely split the handling of the sync and local databases. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5b2de3d8ecceea0eed3124e50792400adce4e95a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 13 18:04:07 2010 +1000 Separate be_files into be_sync and be_local The file be_files.c is "split" to be_local.c and be_sync.c in order to achieve separate handling of sync and local databases. Some basic clean-up of functions that are only of use for local or sync databases has been performed and some rough function renaming in duplicated code has been performed to prevent compilation errors. However, most of the clean-up and final separation of sync and local db handling occurs in following patches. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6eedf06fcc224648155bc5253d6fe1975be8da00 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 13 17:50:54 2010 -0500 Fix bash shell location check BASH is defined when you are actually using bash during configure, which sucks because it ends up being '/bin/sh', messing up all of our scripts. Change the name of the variable we use in configure, and also ensure we get a full path to the executable by using AC_PATH_PROGS rather than AC_CHECK_PROGS. Finally, change the variable name everywhere we use it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 96e277cfd935d680d6309311260fe79567324e9c Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 13 22:56:35 2010 +1000 Move db cache handling functions These will be needed for the handling of both local and sync database caches, so put them in a common location. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0909a72000b03332c5203b16b6a4e862c0662e03 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 13 17:55:55 2010 +1000 Move database handling utility functions Move splitname, checkdbdir, get_pkgpath into db.{h,c} as these will be needed to parse both the local and sync databases during the initial splitting. They will be moved out of db.{h,c} at to more appropriate locations at a later stage. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c56b576f6fef464f82f425219ef386fe8b742899 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Aug 2 14:40:04 2010 +1000 Fix documentation syntax and typo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit efbae3cfcbd8e401084cb26853bbe46120daea4d Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jul 10 21:06:21 2010 -0500 Initial hack at a DB operations struct It doesn't do a whole lot yet, but these type of operations will potentially be different for the DBs we load. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 522ef5e981580a52ee0ffa37178d7ddf116ebd51 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 12 07:49:01 2008 +1000 Move the cache stuff where it should be Cache bullshit only has relevance to be_files, so move it there. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: BIG rebase] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b9a531c2d7e3eefab5d987d83a1cb869e1220fac Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 11 16:49:01 2008 -0500 Move changelog functions to callback struct Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6cebd4e6028f717663cda0af1221f3ac74d5ab9f Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 11 16:00:33 2008 -0500 Complete rework of package accessor logic Hopefully we've finally arrived at package handling nirvana, or at least this commit will get us a heck of a lot closer. The former method of getting the depends list for a package was the following: 1. call alpm_pkg_get_depends() 2. this method would check if the package came from the cache 3. if so, ensure our cache level is correct, otherwise call db_load 4. finally return the depends list Why did this suck? Because getting the depends list from the package shouldn't care about whether the package was loaded from a file, from the 'package cache', or some other system which we can't even use because the damn thing is so complicated. It should just return the depends list. So what does this commit change? It adds a pointer to a struct of function pointers to every package for all of these 'package operations' as I've decided to call them (I know, sounds completely straightforward, right?). So now when we call an alpm_pkg_get-* function, we don't do any of the cache logic or anything else there- we let the actual backend handle it by delegating all work to the method at pkg->ops->get_depends. Now that be_package has achieved equal status with be_files, we can treat packages from these completely different load points differently. We know a package loaded from a zip file will have all of its fields populated, so we can set up all its accessor functions to be direct accessors. On the other hand, the packages loaded from the local and sync DBs are not always fully-loaded, so their accessor functions are routed through the same logic as before. Net result? More code. However, this code now make it roughly 52 times easier to open the door to something like a read-only tar.gz database backend. Are you still reading? I'm impressed. Looking at the patch will probably be clearer than this long-winded explanation. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: rebase and adjust] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d1126db1281596ba8ea960bfa963e86731d28b5e Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 11 12:00:18 2008 -0500 Allow local and sync db to be treated separately Implement this seemingly simple change in package.h: typedef enum _pmpkgfrom_t { - PKG_FROM_CACHE = 1, - PKG_FROM_FILE + PKG_FROM_FILE = 1, + PKG_FROM_LOCALDB, + PKG_FROM_SYNCDB } pmpkgfrom_t; which requires flushing out several assumptions from around the codebase with regards to usage of the PKG_FROM_CACHE value. Make some changes where required to allow the switch, and now the correct value should be set (via a crude hack) depending on whether a package was loaded as an entry in a local db or a sync db. This patch underwent some big rebasing from Allan and Dan. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 49176461a6b476e673e232075c95f07963750f74 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 7 09:39:39 2010 -0500 Unify caching concerns in package accessors Move almost all of the caching related stuff into a single #define (which should maybe even just be a static function) so we don't duplicate logic all over the place. This also makes the code a heck of a lot shorter and means further changes to this stuff don't have to touch each and every getter function. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7dc3875f15f9600e011c313c8846de6af3a2c8c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 12 08:26:50 2010 -0500 contrib/ follow-up work * Add a .gitignore file * Use the same 'GEN' output we have in the scripts/ Makefile when doing our edits on the .in files * Remove PKGBUILD.vim and vimprojects from our edit list, they have no need to be in the list Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- contrib/.gitignore | 9 + contrib/Makefile.am | 11 +- contrib/{PKGBUILD.vim.in => PKGBUILD.vim} | 0 contrib/bacman.in | 2 +- contrib/pacdiff.in | 2 +- contrib/pacscripts.in | 2 +- contrib/pactree.in | 2 +- contrib/{vimprojects.in => vimprojects} | 0 contrib/wget-xdelta.sh.in | 2 +- lib/libalpm/Makefile.am | 4 +- lib/libalpm/add.c | 7 +- lib/libalpm/{be_files.c => be_local.c} | 704 ++++++++++++++--------------- lib/libalpm/be_package.c | 111 +++++ lib/libalpm/be_sync.c | 440 ++++++++++++++++++ lib/libalpm/cache.c | 291 ------------ lib/libalpm/cache.h | 44 -- lib/libalpm/conflict.c | 1 - lib/libalpm/db.c | 271 ++++++++++-- lib/libalpm/db.h | 48 ++- lib/libalpm/deps.c | 1 - lib/libalpm/package.c | 417 +++++------------- lib/libalpm/package.h | 63 +++- lib/libalpm/po/POTFILES.in | 3 +- lib/libalpm/remove.c | 5 +- lib/libalpm/sync.c | 3 +- lib/libalpm/trans.c | 1 - lib/libalpm/util.c | 45 ++ lib/libalpm/util.h | 2 + scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- src/pacman/sync.c | 32 +- 36 files changed, 1431 insertions(+), 1106 deletions(-) create mode 100644 contrib/.gitignore rename contrib/{PKGBUILD.vim.in => PKGBUILD.vim} (100%) rename contrib/{vimprojects.in => vimprojects} (100%) rename lib/libalpm/{be_files.c => be_local.c} (59%) create mode 100644 lib/libalpm/be_sync.c delete mode 100644 lib/libalpm/cache.c delete mode 100644 lib/libalpm/cache.h hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-88-g46ffd34
by dan＠archlinux.org 14 Oct '10

14 Oct '10

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 46ffd342a4255916a9599692b5969ae4cd85a156 (commit) via fa933df65b9e024ec3291fcc1f995be3dc000e0c (commit) via 67068b64b9da96a0122591ede25c50ab307a1612 (commit) via 73442a7e035a7b7f8ed80261226989ae87edd3a9 (commit) via 1e0e5b2a0241d1f3e298991c0d583afb9c80baef (commit) via dff73a2a69de1c55a0ba9fe75a9f7a900e5ed15b (commit) from bef19a266bf5d80b68cab02f6a3ccc3fcedbec6d (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 46ffd342a4255916a9599692b5969ae4cd85a156 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sat Oct 9 09:20:57 2010 +0200 CLI args: add pactest with an invalid combination Pacman should catch cases in which the passed arguments don't apply to the current operation (sync/query/...). Also see FS#20950. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa933df65b9e024ec3291fcc1f995be3dc000e0c Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 01:05:04 2010 +0200 pactest: fix gensync gensync generated a sync.db file with PKGINFO syntax, this is not quite what pacman expects. Also the file was only added to the Server path: root/var/pub/sync/sync.db but it was not available in the normal sync db path: root/var/lib/pacman/sync/sync.db Change gensync() to generate var/lib/pacman/sync/sync.db and then copy it to var/pub/sync/sync.db (this is used by sync200 -Sy test). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 67068b64b9da96a0122591ede25c50ab307a1612 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 01:05:03 2010 +0200 pactest: use simpler method to create tar Just like in 24fc623e1a8bf905cf0367f9bd40bc5bd6034378, apply to pmdb gensync as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 73442a7e035a7b7f8ed80261226989ae87edd3a9 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 7 17:53:11 2010 -0500 Only check for function if we are using libfetch We did this check unconditionally, rather than only doing it if we were actually going to build and run with libfetch. This is safe because we would have already bailed if libfetch was explicitly requested but not found. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1e0e5b2a0241d1f3e298991c0d583afb9c80baef Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 7 15:50:29 2010 -0500 Remove use of `seq` in pactree This is not a bash builtin, so can potentially cause portability issues. Additionally, the use of it is completely unnecessary as it can all be done within bash (and done faster). $ time pactree xfwm4 >/dev/null (old version) real 0m3.245s $ time ./contrib/pactree xfwm4 >/dev/null (new version) real 0m3.042s Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dff73a2a69de1c55a0ba9fe75a9f7a900e5ed15b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 5 11:44:32 2010 -0500 Avoid stat call to determine is_directory if possible On Linux and OS X, we can determine if an entry obtained through a readdir() call is a directory without also having to stat it. This can save a significant number of syscalls. The performance increase isn't dramatic, but it could be on some platforms (e.g. Cygwin) so it shouldn't hurt to use this unconditionally where supported. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 +++- contrib/pactree | 3 ++- lib/libalpm/be_files.c | 29 +++++++++++++++++++---------- test/pacman/pmdb.py | 37 +++++++++++++++---------------------- test/pacman/pmtest.py | 12 +++++++----- test/pacman/tests/pacman005.py | 11 +++++++++++ test/pacman/util.py | 1 + 7 files changed, 58 insertions(+), 39 deletions(-) create mode 100644 test/pacman/tests/pacman005.py hooks/post-receive -- The official pacman repository

4 6

[pacman-dev] We've broken the bash
by Dan McGee 14 Oct '10

14 Oct '10

I think this was alluded to a while back, but we are starting to show some problems with our naming scheme and bash variable/function naming rules: /usr/bin/makepkg: line 1831: declare: `package_python-xlwt': not a valid identifier With latest makepkg built from git. -Dan

4 13

[pacman-dev] tar based sync backend implemented!
by Allan McRae 13 Oct '10

13 Oct '10

Hi, I have implemented the reading directly from the db tarball for sync databases. See the patchset on by "backend" branch (http://projects.archlinux.org/users/allan/pacman.git/log/?h=backend) Some of the changes are quite big (e.g. 9 files changed, 2184 insertions, 1571 deletions), but that is mainly moving and duplicating code in the process of splitting the handling of local and sync dbs. There is still _a lot_ of clean-up to be done in the code, but it is fully functional. This breaks pactests... lots of pactests... but that is expected as the pactest suite does not understand a tar based sync db. I would like help fixing that as I get lost in the pactest code. Anyway, here is the timing for some operations. First time is with dropped caches, the second running it again with the db cached. pacman -Syy (download time ~15-20sec) old: 1m25.197s, 0m22.445s new: 0m19.391s, 0m22.084s (download speed variation...) pacman -Sl extra old: 0m6.973s, 0m0.193s new: 0m3.974s, 0m0.390s pacman -Ss pacman old: 0m11.521s, 0m0.395s new: 0m4.171s, 0m0.477s pacman -Si pacman old: 0m6.067s, 0m0.101s new: 0m1.929s, 0m0.437s echo "n" | pacman -Su (five packages to update) old: 0m17.823s, 0m0.306s new: 0m10.577s, 0m0.489s So the tar backend gets some quite significant speed gains in the uncached case, and has marginal losses when the db is cached. Note that the entire sync db is read and parsed no matter the (sync) operation. That explains the difference in the cases with the db cached. This could be adjusted to read the package list (pkgname, pkgver-pkgrel) first and read the desc/depends files for the entire db or a single package as needed but that is probably distant future stuff... Allan

1 2

[pacman-dev] [RFC] pactree rewrite in C
by Dave Reisner 13 Oct '10

13 Oct '10

The recent patchwork over the weekend inspired me to take a closer look at pactree. My first impression was that it would be a great candidate for a rewrite in C. http://www.github.com/falconindy/pactree Results are entertaining: # bash version $ time pactree -r glib2 >/dev/null real 0m2.538s user 0m1.593s sys 0m0.435s # C rewrite $ time ./pactree -r glib2 >/dev/null real 0m0.016s user 0m0.007s sys 0m0.009s I'm finding that it's even slightly more accurate than the bash version WRT to reverse dependency tracking as it's hooking into alpm's alpm_pkg_compute_required_by() instead of wandering through the file hierarchy. It's feature complete compared to the Bash version, aside from the export to graphviz. The only functional change I've made is: when walking reverse depends, don't re-walk already visited dependencies. I thought this was a logical change given the behavior of the standard dependency tracking. I'm happy to offer this up for merging if desirable. There's a few ugly bits in the code I still want to refactor -- if anyone has any comments or criticisms, they're very welcome. d

3 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-97-g5fcb005
by dan＠archlinux.org 12 Oct '10

12 Oct '10

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 5fcb005ebd270c1ecff3403695680145253961a2 (commit) via 827258f32ee898ed5422bc9219d9a42bd9bd2360 (commit) via 0ff2a9149711b9179d288f579c792890cd81d79b (commit) via 05f0a28932c1acab7a9ddb58435d69626dad54da (commit) via bce3c8efc7a2d187984aa0e7037307b99c217fd7 (commit) via 7d937772313a796f4c0bff76bf1bd7d78f8ccb5a (commit) via c9179b09db405e89093c07756d8e674ff8119ea2 (commit) via 53b41afbe8c47afaa5daf94f4e66cab81bd024cd (commit) via fb79d58109ff5a55ac3cea83607eb41e70456b17 (commit) from 46ffd342a4255916a9599692b5969ae4cd85a156 (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 5fcb005ebd270c1ecff3403695680145253961a2 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Oct 8 22:59:30 2010 +0200 CLI args: stricter/better parsing In the following, the letters SRUDQ refer to the corresponding pacman operations. Most of the work in this commit is about removing as many options as possible from the global section and moving them to where they actually belong. Additionally, --ignore{,group} are added to U and --dbonly is added to S. --dbonly added to S --asdeps moved to S/U/D --asexplicit moved to S/U/D --print-format moved to S/U/R --noprogressbar moved to S/U/R --noscriptlet moved to S/U/R --ignorepkg added to U --ignoregrp added to U -d moved to S/U/R (--nodeps) and Q (--deps) -p moved to S/U/R (--print) and Q (--file) -f moved to S/U Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 827258f32ee898ed5422bc9219d9a42bd9bd2360 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Oct 8 22:34:17 2010 +0200 CLI args: reorganize parsing Split parsing of CLI arguments into separate functions: parsearg_op (operations) parsearg_global (global options) parsearg_{database,query,remove,sync,deptest,upgrade} Organization strictly follows the manpage (even where the manpage is incorrect) - these cases will be fixed in the following commits. Switch cases are copy/pasted and statements unrelated to chosen operation are deleted. Parsing logic adjusted as follows: 1) Parse operation 2) If we can bail out early (duplicate op, help/version requested) do so 3) Parse arguments again: foreach arg: if arg is operation: continue tryparse_args_specific_to_op if unsuccessful tryparse_args_global if unsuccessful print error message and exit Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0ff2a9149711b9179d288f579c792890cd81d79b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 11 20:20:06 2010 -0500 util: fall cleaning on single file programs * Add a bunch of static declarations where possible * Fix void functions to be proper syntax, e.g. void func(void) * Consistency fixes (such as argv references) * Remove dead str_cmp() function from testdb * Remove unneeded config.h header includes * vercmp: remove completely unnecessary string copying Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 05f0a28932c1acab7a9ddb58435d69626dad54da Author: Nezmer <git(a)nezmer.info> Date: Tue Oct 12 02:23:16 2010 +0300 Use sysconfdir, localstatedir, BASH instead of hardcoded values This applies to contrib/ files, our scripts, and the documentation. Dan: fix 'make clean' in contrib/ directory. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bce3c8efc7a2d187984aa0e7037307b99c217fd7 Author: Nezmer <git(a)nezmer.info> Date: Tue Oct 12 00:20:57 2010 +0300 Add .in extension to files in contrib This is needed If we want to use sysconfdir,localstatedir and other variables. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7d937772313a796f4c0bff76bf1bd7d78f8ccb5a Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 18:28:35 2010 +0200 repo-add: more informative delta messages - Print an error if database entry was not found and delta entry cannot be added - More informative line when delta entry is added (oldfile -> newfile) Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c9179b09db405e89093c07756d8e674ff8119ea2 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 17:08:00 2010 +0200 repo-add: add delta generation This allows deltas to be generated at repo-add invocation time as opposed to just added to the database. It will generate the delta from the package version currently in the database. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 53b41afbe8c47afaa5daf94f4e66cab81bd024cd Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Aug 18 23:53:29 2010 +0200 pactest: fix typo in ignore001 Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb79d58109ff5a55ac3cea83607eb41e70456b17 Author: Nezmer <git(a)nezmer.info> Date: Mon Oct 11 22:16:49 2010 +0300 makepkg: Use mkfifo instead of GNU-only 'mknod <file> p' 'mknod <file> p' is apparently GNU-only. Looking at coreutils' source code, It just calls mkfifo. This one line patch should fix makepkg logging in non-GNU systems. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + contrib/Makefile.am | 33 ++- contrib/{PKGBUILD.vim => PKGBUILD.vim.in} | 0 contrib/{bacman => bacman.in} | 16 +- contrib/{bash_completion => bash_completion.in} | 0 contrib/{pacdiff => pacdiff.in} | 2 +- contrib/{paclist => paclist.in} | 0 contrib/{pacscripts => pacscripts.in} | 8 +- contrib/{pacsearch => pacsearch.in} | 0 contrib/{pactree => pactree.in} | 10 +- contrib/{vimprojects => vimprojects.in} | 0 contrib/{wget-xdelta.sh => wget-xdelta.sh.in} | 10 +- contrib/{zsh_completion => zsh_completion.in} | 18 +- doc/Makefile.am | 1 + doc/makepkg.8.txt | 2 +- doc/pacman.8.txt | 30 +- doc/pacman.conf.5.txt | 12 +- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 4 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 4 +- scripts/repo-add.sh.in | 36 ++- src/pacman/pacman.c | 453 +++++++++++++++-------- src/util/cleanupdelta.c | 8 +- src/util/testdb.c | 17 +- src/util/testpkg.c | 6 +- src/util/vercmp.c | 23 +- test/pacman/tests/ignore001.py | 2 +- test/pacman/tests/pacman005.py | 3 - 30 files changed, 438 insertions(+), 266 deletions(-) rename contrib/{PKGBUILD.vim => PKGBUILD.vim.in} (100%) rename contrib/{bacman => bacman.in} (95%) rename contrib/{bash_completion => bash_completion.in} (100%) rename contrib/{pacdiff => pacdiff.in} (99%) rename contrib/{paclist => paclist.in} (100%) rename contrib/{pacscripts => pacscripts.in} (95%) rename contrib/{pacsearch => pacsearch.in} (100%) rename contrib/{pactree => pactree.in} (97%) rename contrib/{vimprojects => vimprojects.in} (100%) rename contrib/{wget-xdelta.sh => wget-xdelta.sh.in} (88%) rename contrib/{zsh_completion => zsh_completion.in} (92%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] util: fall cleaning on single file programs
by Dan McGee 12 Oct '10

12 Oct '10

* Add a bunch of static declarations where possible * Fix void functions to be proper syntax, e.g. void func(void) * Consistency fixes (such as argv references) * Remove dead str_cmp() function from testdb * Remove unneeded config.h header includes * vercmp: remove completely unnecessary string copying Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/util/cleanupdelta.c | 8 ++++---- src/util/testdb.c | 17 ++++++----------- src/util/testpkg.c | 6 ++---- src/util/vercmp.c | 23 +++++++---------------- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index ffcfaba..c1ef18c 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -49,7 +49,7 @@ void output_cb(pmloglevel_t level, char *fmt, va_list args) } -void checkpkgs(alpm_list_t *pkglist) +static void checkpkgs(alpm_list_t *pkglist) { alpm_list_t *i, *j; for(i = pkglist; i; i = alpm_list_next(i)) { @@ -63,7 +63,7 @@ void checkpkgs(alpm_list_t *pkglist) } } -void checkdbs(char *dbpath, alpm_list_t *dbnames) { +static void checkdbs(char *dbpath, alpm_list_t *dbnames) { char syncdbpath[PATH_MAX]; pmdb_t *db = NULL; alpm_list_t *i; @@ -82,14 +82,14 @@ void checkdbs(char *dbpath, alpm_list_t *dbnames) { } -void usage() { +static void usage(void) { fprintf(stderr, "usage:\n"); fprintf(stderr, "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); exit(1); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { char *dbpath = DBPATH; int a = 1; diff --git a/src/util/testdb.c b/src/util/testdb.c index 45a2626..28f2b2b 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -30,11 +30,6 @@ #define BASENAME "testdb" -int str_cmp(const void *s1, const void *s2) -{ - return(strcmp(s1, s2)); -} - static void cleanup(int signum) { if(alpm_release() == -1) { fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast()); @@ -100,7 +95,7 @@ static int db_test(char *dbpath, int local) return(ret); } -int checkdeps(alpm_list_t *pkglist) +static int checkdeps(alpm_list_t *pkglist) { alpm_list_t *data, *i; int ret = 0; @@ -119,7 +114,7 @@ int checkdeps(alpm_list_t *pkglist) return(ret); } -int checkconflicts(alpm_list_t *pkglist) +static int checkconflicts(alpm_list_t *pkglist) { alpm_list_t *data, *i; int ret = 0; @@ -135,7 +130,7 @@ int checkconflicts(alpm_list_t *pkglist) return(ret); } -int check_localdb(char *dbpath) { +static int check_localdb(char *dbpath) { char localdbpath[PATH_MAX]; int ret = 0; pmdb_t *db = NULL; @@ -159,7 +154,7 @@ int check_localdb(char *dbpath) { return(ret); } -int check_syncdbs(char *dbpath, alpm_list_t *dbnames) { +static int check_syncdbs(char *dbpath, alpm_list_t *dbnames) { char syncdbpath[PATH_MAX]; int ret = 0; pmdb_t *db = NULL; @@ -190,7 +185,7 @@ cleanup: return(ret); } -void usage() { +static void usage(void) { fprintf(stderr, "usage:\n"); fprintf(stderr, "\t%s [-b <pacman db>] : check the local database\n", BASENAME); @@ -199,7 +194,7 @@ void usage() { exit(1); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { int ret = 0; char *dbpath = DBPATH; diff --git a/src/util/testpkg.c b/src/util/testpkg.c index d86fb1e..6fc0ce0 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> /* printf */ #include <stdarg.h> /* va_list */ @@ -26,7 +24,7 @@ #define BASENAME "testpkg" -static void output_cb(pmloglevel_t level, char *fmt, va_list args) +void output_cb(pmloglevel_t level, char *fmt, va_list args) { if(fmt[0] == '\0') { return; @@ -39,7 +37,7 @@ static void output_cb(pmloglevel_t level, char *fmt, va_list args) vprintf(fmt, args); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { int retval = 1; /* default = false */ pmpkg_t *pkg = NULL; diff --git a/src/util/vercmp.c b/src/util/vercmp.c index 959dc13..8a785bb 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -18,20 +18,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> /* printf */ #include <string.h> /* strncpy */ #define BASENAME "vercmp" -#define MAX_LEN 255 - /* forward declaration, comes from vercmp.o in libalpm source that is linked in * directly so we don't have any library deps */ int alpm_pkg_vercmp(const char *a, const char *b); -static void usage() +static void usage(void) { fprintf(stderr, "usage: %s <ver1> <ver2>\n\n", BASENAME); fprintf(stderr, "return values:\n"); @@ -42,8 +38,8 @@ static void usage() int main(int argc, char *argv[]) { - char s1[MAX_LEN] = ""; - char s2[MAX_LEN] = ""; + const char *s1 = ""; + const char *s2 = ""; int ret; if(argc == 1) { @@ -56,16 +52,11 @@ int main(int argc, char *argv[]) usage(); return(0); } - if(argc > 1) { - strncpy(s1, argv[1], MAX_LEN); - s1[MAX_LEN -1] = '\0'; - } if(argc > 2) { - strncpy(s2, argv[2], MAX_LEN); - s2[MAX_LEN -1] = '\0'; - } else { - printf("0\n"); - return(0); + s2 = argv[2]; + } + if(argc > 1) { + s1 = argv[1]; } ret = alpm_pkg_vercmp(s1, s2); -- 1.7.3.1

1 0

[pacman-dev] [PATCH 2/2] Use sysconfdir, localstatedir, BASH instead of hard-coded values (v.2)
by Nezmer 11 Oct '10

11 Oct '10

Signed-off-by: Nezmer <git(a)nezmer.info> --- configure.ac | 1 + contrib/Makefile.am | 30 ++++++++++++++++++++++++++++-- contrib/bacman.in | 16 ++++++++-------- contrib/pacdiff.in | 2 +- contrib/pacscripts.in | 8 ++++---- contrib/pactree.in | 10 +++++----- contrib/wget-xdelta.sh.in | 10 +++++----- contrib/zsh_completion.in | 18 +++++++++--------- doc/Makefile.am | 1 + doc/makepkg.8.txt | 2 +- doc/pacman.8.txt | 4 ++-- doc/pacman.conf.5.txt | 12 ++++++------ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 4 ++-- scripts/repo-add.sh.in | 2 +- 18 files changed, 78 insertions(+), 49 deletions(-) diff --git a/configure.ac b/configure.ac index 37b26f2..115aeb1 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,7 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_LIBTOOL AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false]) +AC_CHECK_PROGS([BASH], [bash bash4 bash3], [false]) # find installed gettext AM_GNU_GETTEXT([external]) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index c6243b1..f10abbf 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = \ +OURFILES = \ PKGBUILD.vim \ bacman \ bash_completion \ @@ -9,7 +9,33 @@ EXTRA_DIST = \ pactree \ vimprojects \ wget-xdelta.sh \ - zsh_completion \ + zsh_completion + +EXTRA_DIST = \ + PKGBUILD.vim.in \ + bacman.in \ + bash_completion.in \ + pacdiff.in \ + paclist.in \ + pacscripts.in \ + pacsearch.in \ + pactree.in \ + vimprojects.in \ + wget-xdelta.sh.in \ + zsh_completion.in \ README +edit = sed \ + -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@BASH[@]|$(BASH)|g' + +$(OURFILES): Makefile + @rm -f $@ $@.tmp + @cp -a $@.in $@.tmp + $(edit) $@.in >$@.tmp + @mv $@.tmp $@ + +all-am: $(OURFILES) + # vim:set ts=2 sw=2 noet: diff --git a/contrib/bacman.in b/contrib/bacman.in index 6dd7839..2a93f8b 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # bacman: recreate a package from a running system # This script rebuilds an already installed package using metadata @@ -67,20 +67,20 @@ fi # # Setting environmental variables # -if [ ! -r /etc/pacman.conf ]; then - echo "ERROR: unable to read /etc/pacman.conf" +if [ ! -r @sysconfdir@/pacman.conf ]; then + echo "ERROR: unable to read @sysconfdir@/pacman.conf" exit 1 fi -eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) -pac_db="${DBPath:-/var/lib/pacman/}/local" +eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) +pac_db="${DBPath:-@localstatedir@/lib/pacman/}/local" -if [ ! -r /etc/makepkg.conf ]; then - echo "ERROR: unable to read /etc/makepkg.conf" +if [ ! -r @sysconfdir@/makepkg.conf ]; then + echo "ERROR: unable to read @sysconfdir@/makepkg.conf" exit 1 fi -source "/etc/makepkg.conf" +source "@sysconfdir@/makepkg.conf" if [ -r ~/.makepkg.conf ]; then source ~/.makepkg.conf fi diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index 3f26f38..716333a 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # pacdiff : a simple pacnew/pacorig/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 101fb15..123c79d 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # pacscripts : tries to print out the {pre,post}_{install,remove,upgrade} # scripts of a given package @@ -27,7 +27,7 @@ set -o errexit progname=$(basename $0) progver="0.4" -conf="/etc/pacman.conf" +conf="@sysconfdir@/pacman.conf" if [ ! -r "$conf" ]; then echo "ERROR: unable to read $conf" @@ -36,8 +36,8 @@ fi eval $(awk '/DBPath/ {print $1$2$3}' "$conf") eval $(awk '/CacheDir/ {print $1$2$3}' "$conf") -pac_db="${DBPath:-/var/lib/pacman}/local" -pac_cache="${CacheDir:-/var/cache/pacman/pkg}" +pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" +pac_cache="${CacheDir:-@localstatedir@/cache/pacman/pkg}" error() { local mesg=$1; shift diff --git a/contrib/pactree.in b/contrib/pactree.in index 6051724..29c6af6 100755 --- a/contrib/pactree.in +++ b/contrib/pactree.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # pactree : a simple dependency tree viewer # # Copyright (C) 2008 Carlo "carlocci" Bersani <carlocci(a)gmail.com> @@ -272,14 +272,14 @@ if [ $graphviz -eq 1 ]; then fi fi -if [ ! -r /etc/pacman.conf ]; then - echo "ERROR: unable to read /etc/pacman.conf" +if [ ! -r @sysconfdir@/pacman.conf ]; then + echo "ERROR: unable to read @sysconfdir@/pacman.conf" exit 1 else - eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) + eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) fi -pac_db="${DBPath:-/var/lib/pacman}/local" +pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" if [ ! -d "$pac_db" ] ; then echo "ERROR: pacman database directory ${pac_db} not found" diff --git a/contrib/wget-xdelta.sh.in b/contrib/wget-xdelta.sh.in index 4656f4d..caf0171 100755 --- a/contrib/wget-xdelta.sh.in +++ b/contrib/wget-xdelta.sh.in @@ -1,7 +1,7 @@ -#!/bin/bash +#!@BASH@ -if [ -r "/etc/makepkg.conf" ]; then - source /etc/makepkg.conf +if [ -r "@sysconfdir@/makepkg.conf" ]; then + source @sysconfdir@/makepkg.conf else echo "wget-xdelta: Unable to find makepkg.conf" exit 1 @@ -30,11 +30,11 @@ new_version=$(echo $pkg_data | cut -d ' ' -f 2) base_url=${file_url%/*} # Look for the last version -for file in $(ls -r /var/cache/pacman/pkg/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do +for file in $(ls -r @localstatedir@/cache/pacman/pkg/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do [[ "$file" =~ "$CARCH" ]] && arch="-$CARCH" || arch="" check_version=$(echo $file | \ sed "s|^.*/${pkgname}-$[[:alnum:]_\.]*-[[:alnum:]_\.]*$${arch}$PKGEXT$|\1|" | \ - grep -v "^/var/cache/pacman/pkg") + grep -v "^@localstatedir@/cache/pacman/pkg") [ "$check_version" = "" ] && continue diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f69fe63..1691913 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -222,20 +222,20 @@ _pacman_completions_all_groups() { _pacman_completions_all_packages() { local -a cmd packages repositories packages_long - repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) typeset -U repositories - packages_long=(/var/lib/pacman/sync/${^repositories}/*(/)) - packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + packages_long=(@localstatedir@/lib/pacman/sync/${^repositories}/*(/)) + packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} ) typeset -U packages _wanted packages expl "packages" compadd - "${(@)packages}" if [[ $PREFIX != */* ]] ; then - repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) typeset -U repositories _wanted repo_packages expl "repository/package" compadd -S "/" $repositories else compset -P '*/' - packages_long=(/var/lib/pacman/sync/$IPREFIX*(/)) - packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + packages_long=(@localstatedir@/lib/pacman/sync/$IPREFIX*(/)) + packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} ) typeset -U packages _wanted repo_packages expl "repository/package" compadd ${(@)packages} fi @@ -253,15 +253,15 @@ _pacman_completions_installed_groups() { # provides completions for installed packages _pacman_completions_installed_packages() { local -a cmd packages packages_long - packages_long=(/var/lib/pacman/local/*(/)) - packages=( ${${packages_long/\/var\/lib\/pacman\/local\//}%-*-*} ) + packages_long=(@localstatedir@/lib/pacman/local/*(/)) + packages=( ${${packages_long#@localstatedir@/lib/pacman/local/}%-*-*} ) compadd "$@" -a packages } # provides completions for repository names _pacman_completions_repositories() { local -a cmd repositories - repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) # Uniq the array typeset -U repositories compadd "$@" -a repositories diff --git a/doc/Makefile.am b/doc/Makefile.am index 2e656f6..748eb5f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -96,6 +96,7 @@ ASCIIDOC_OPTS = \ -a pacman_version="$(REAL_PACKAGE_VERSION)" \ -a pacman_date="`date +%Y-%m-%d`" \ -a pkgdatadir=$(pkgdatadir) \ + -a localstatedir=$(localstatedir) \ -a sysconfdir=$(sysconfdir) A2X_OPTS = \ diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index a2fdb3f..ff0f2b6 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -53,7 +53,7 @@ Options in linkman:makepkg.conf[5]. *--config* <`/path/to/config`>:: - Use an alternate config file instead of the `/etc/makepkg.conf` default; + Use an alternate config file instead of the `{sysconfdir}/makepkg.conf` default; *-d, \--nodeps*:: Do not perform any dependency checks. This will let you override and diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index de1f51f..2656fc7 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -118,7 +118,7 @@ Options *-b, \--dbpath* <'path'>:: Specify an alternative database location (a typical default is - ``/var/lib/pacman''). This should not be used unless you know what you are + ``{localstatedir}/lib/pacman''). This should not be used unless you know what you are doing. *NOTE*: if specified, this is an absolute path and the root path is not automatically prepended. @@ -151,7 +151,7 @@ Options *\--cachedir* <'dir'>:: Specify an alternative package cache location (a typical default is - ``/var/cache/pacman/pkg''). Multiple cache directories can be specified, + ``{localstatedir}/cache/pacman/pkg''). Multiple cache directories can be specified, and they are tried in the order they are passed to pacman. *NOTE*: this is an absolute path, the root path is not automatically prepended. diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 0e8426a..ecc5c74 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -35,7 +35,7 @@ NoUpgrade = etc/passwd etc/group etc/shadow NoUpgrade = etc/fstab [core] -Include = /etc/pacman.d/core +Include = {sysconfdir}/pacman.d/core [custom] Server = file:///home/pkgs @@ -57,13 +57,13 @@ Options *DBPath =* path/to/db/dir:: Overrides the default location of the toplevel database directory. A - typical default is ``/var/lib/pacman/''. Most users will not need to set + typical default is ``{localstatedir}/lib/pacman/''. Most users will not need to set this option. *NOTE*: if specified, this is an absolute path and the root path is not automatically prepended. *CacheDir =* path/to/cache/dir:: Overrides the default location of the package cache directory. A typical - default is ``/var/cache/pacman/pkg/''. Multiple cache directories can be + default is ``{localstatedir}/cache/pacman/pkg/''. Multiple cache directories can be specified, and they are tried in the order they are listed in the config file. If a file is not found in any cache directory, it will be downloaded to the first cache directory with write access. *NOTE*: this is an absolute @@ -72,7 +72,7 @@ Options *LogFile =* '/path/to/file':: Overrides the default location of the pacman log file. A typical default - is ``/var/log/pacman.log''. This is an absolute path and the root directory + is ``{localstatedir}/log/pacman.log''. This is an absolute path and the root directory is not prepended. *HoldPkg =* package ...:: @@ -147,7 +147,7 @@ Options *UseSyslog*:: Log action messages through syslog(). This will insert log entries into - ``/var/log/messages'' or equivalent. + ``{localstatedir}/log/messages'' or equivalent. *ShowSize*:: Display the size of individual packages for '\--sync' and '\--query' modes. @@ -180,7 +180,7 @@ contain a file that lists the servers for that repository. # use this repository first Server = ftp://ftp.archlinux.org/core/os/arch # next use servers as defined in the mirrorlist below -Include = /etc/pacman.d/mirrorlist +Include = {sysconfdir}/pacman.d/mirrorlist -------- During parsing, pacman will define the `$repo` variable to the name of the diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 31e8fb5..b9e3038 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -35,6 +35,7 @@ edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ + -e 's|@BASH[@]|$(BASH)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3a7a4d1..baabf26 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!@BASH@ -e # # makepkg - make packages compatible for use with pacman # @configure_input@ diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 78b2345..eb6691c 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # pacman-optimize # @configure_input@ diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 1550fa1..d45678d 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # pkgdelta - create delta files for use with pacman and repo-add # @configure_input@ diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index 0cd4c08..3851b77 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # rankmirrors - read a list of mirrors from a file and rank them by speed # @configure_input@ @@ -25,7 +25,7 @@ usage() { echo "Usage: rankmirrors [options] MIRRORFILE | URL" echo echo "Ranks pacman mirrors by their connection and opening speed. Pacman mirror" - echo "files are located in /etc/pacman.d/. It can also rank one mirror if the URL is" + echo "files are located in @sysconfdir@/pacman.d/. It can also rank one mirror if the URL is" echo "provided." echo echo "Options:" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 8ef940d..4338011 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # repo-add - add a package to a given repo database file # repo-remove - remove a package entry from a given repo database file -- 1.7.3.1

1 0

[pacman-dev] [PATCH] alpm/remove.c : respect --dbonly during remove-upgrade
by Xavier Chantry 11 Oct '10

11 Oct '10

When a -Sk or -Uk operation induced a removal of an existing local package, --dbonly was not in effect and the files were all removed. Fixing this behavior was already marked as TODO in database012 pactest << TODO: I honestly think the above should NOT delete the original les, it hould upgrade the DB entry without touching anything on the file stem. E.g. this test should be the same as: pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz >> Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- doc/pacman.8.txt | 2 -- lib/libalpm/remove.c | 4 ++++ src/pacman/pacman.c | 3 +-- test/pacman/tests/database012.py | 8 +------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index f389dfd..866c5a2 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -155,8 +155,6 @@ Transaction Options (apply to '-S', '-R' and '-U') *-k, \--dbonly*:: Adds/Removes the database entry only, leaves all files in place. - On an upgrade operation, the existing package and all files - will be removed and the database entry for the new package will be added. *\--noprogressbar*:: Do not show a progress bar when downloading files. This can be useful diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index dfaba03..e0099fb 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -311,6 +311,9 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *tra _alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n", oldpkg->name, oldpkg->version); + if(trans->flags & PM_TRANS_FLAG_DBONLY) + goto db; + /* copy the remove skiplist over */ skip_remove = alpm_list_join(alpm_list_strdup(trans->skip_remove),alpm_list_strdup(handle->noupgrade)); @@ -345,6 +348,7 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *tra alpm_list_free(newfiles); FREELIST(skip_remove); +db: /* remove the package from the database */ _alpm_log(PM_LOG_DEBUG, "updating database\n"); _alpm_log(PM_LOG_DEBUG, "removing database entry '%s'\n", pkgname); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 933698e..4bf2613 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -90,7 +90,6 @@ static void usage(int op, const char * const myname) printf("%s: %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); printf(_(" -c, --cascade remove packages and all packages that depend on them\n")); - printf(_(" -k, --dbonly only remove database entries, do not remove files\n")); printf(_(" -n, --nosave remove configuration files as well\n")); printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n" " (-ss includes explicitly installed dependencies too)\n")); @@ -138,7 +137,6 @@ static void usage(int op, const char * const myname) case PM_OP_SYNC: case PM_OP_UPGRADE: printf(_(" -f, --force force install, overwrite conflicting files\n")); - printf(_(" -k, --dbonly add database entries, do not install or keep existing files\n")); printf(_(" --asdeps install packages as non-explicitly installed\n")); printf(_(" --asexplicit install packages as explicitly installed\n")); printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); @@ -147,6 +145,7 @@ static void usage(int op, const char * const myname) /* pass through */ case PM_OP_REMOVE: printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -k, --dbonly only modify database entries, not package files\n")); printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); printf(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); printf(_(" --print only print the targets instead of performing the operation\n")); diff --git a/test/pacman/tests/database012.py b/test/pacman/tests/database012.py index a1f8698..52813ec 100644 --- a/test/pacman/tests/database012.py +++ b/test/pacman/tests/database012.py @@ -21,11 +21,5 @@ self.addrule("PKG_EXIST=dummy") self.addrule("PKG_VERSION=dummy|2.0-1") for f in lp.files: - self.addrule("!FILE_EXIST=%s" % f) -# TODO: I honestly think the above should NOT delete the original files, it -# should upgrade the DB entry without touching anything on the file system. -# E.g. this test should be the same as: -# pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz -#for f in lp.files: -# self.addrule("FILE_EXIST=%s" % f) + self.addrule("FILE_EXIST=%s" % f) self.addrule("!FILE_EXIST=bin/dummy2") -- 1.7.3.1

1 0

[pacman-dev] [PATCH 1/2] Add .in extension to files in contrib
by Nezmer 11 Oct '10

11 Oct '10

This is needed If we want to use sysconfdir,localstatedir and other variables. Signed-off-by: Nezmer <git(a)nezmer.info> --- contrib/{PKGBUILD.vim => PKGBUILD.vim.in} | 0 contrib/{bacman => bacman.in} | 0 contrib/{bash_completion => bash_completion.in} | 0 contrib/{pacdiff => pacdiff.in} | 0 contrib/{paclist => paclist.in} | 0 contrib/{pacscripts => pacscripts.in} | 0 contrib/{pacsearch => pacsearch.in} | 0 contrib/{pactree => pactree.in} | 0 contrib/{vimprojects => vimprojects.in} | 0 contrib/{wget-xdelta.sh => wget-xdelta.sh.in} | 0 contrib/{zsh_completion => zsh_completion.in} | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename contrib/{PKGBUILD.vim => PKGBUILD.vim.in} (100%) rename contrib/{bacman => bacman.in} (100%) rename contrib/{bash_completion => bash_completion.in} (100%) rename contrib/{pacdiff => pacdiff.in} (100%) rename contrib/{paclist => paclist.in} (100%) rename contrib/{pacscripts => pacscripts.in} (100%) rename contrib/{pacsearch => pacsearch.in} (100%) rename contrib/{pactree => pactree.in} (100%) rename contrib/{vimprojects => vimprojects.in} (100%) rename contrib/{wget-xdelta.sh => wget-xdelta.sh.in} (100%) rename contrib/{zsh_completion => zsh_completion.in} (100%) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim.in similarity index 100% rename from contrib/PKGBUILD.vim rename to contrib/PKGBUILD.vim.in diff --git a/contrib/bacman b/contrib/bacman.in similarity index 100% rename from contrib/bacman rename to contrib/bacman.in diff --git a/contrib/bash_completion b/contrib/bash_completion.in similarity index 100% rename from contrib/bash_completion rename to contrib/bash_completion.in diff --git a/contrib/pacdiff b/contrib/pacdiff.in similarity index 100% rename from contrib/pacdiff rename to contrib/pacdiff.in diff --git a/contrib/paclist b/contrib/paclist.in similarity index 100% rename from contrib/paclist rename to contrib/paclist.in diff --git a/contrib/pacscripts b/contrib/pacscripts.in similarity index 100% rename from contrib/pacscripts rename to contrib/pacscripts.in diff --git a/contrib/pacsearch b/contrib/pacsearch.in similarity index 100% rename from contrib/pacsearch rename to contrib/pacsearch.in diff --git a/contrib/pactree b/contrib/pactree.in similarity index 100% rename from contrib/pactree rename to contrib/pactree.in diff --git a/contrib/vimprojects b/contrib/vimprojects.in similarity index 100% rename from contrib/vimprojects rename to contrib/vimprojects.in diff --git a/contrib/wget-xdelta.sh b/contrib/wget-xdelta.sh.in similarity index 100% rename from contrib/wget-xdelta.sh rename to contrib/wget-xdelta.sh.in diff --git a/contrib/zsh_completion b/contrib/zsh_completion.in similarity index 100% rename from contrib/zsh_completion rename to contrib/zsh_completion.in -- 1.7.3.1

2 4