- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: enable passing PKGBUILD from pipe
by Allan McRae 29 Oct '08

29 Oct '08

Do not attemp to update pkgver/pkgrel when reading a SCM based PKGBUILD from a pipe. Fixes FS#9187. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 52784b6..f5caa12 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1048,6 +1048,10 @@ devel_check() { if [ "$HOLDVER" = "1" ]; then return fi + # Cannot update pkgver/pkgrel if reading PKGBUILD from pipe + if [ ! -f "./$BUILDSCRIPT" ]; then + return + fi if [ "$FORCE_VER" = "" ]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. # This will only be used on the first call to makepkg; subsequent @@ -1115,9 +1119,11 @@ devel_update() { # if [ "$newpkgver" != "" ]; then if [ "$newpkgver" != "$pkgver" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT - source $BUILDSCRIPT + if [ -f "./$BUILDSCRIPT" ]; then + sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT + sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT + source $BUILDSCRIPT + fi fi fi } -- 1.6.0.3

2 5

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-15-ga63aeed
by dan＠archlinux.org 29 Oct '08

29 Oct '08

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 a63aeed562c8bdd6604ec50e6a4b684f6edabda3 (commit) via 2f5d7927254a760a54282d70c827768c56c657b7 (commit) via 1e656c0a6a7f2dcf5dc40f1b1027161847b967b4 (commit) via 50e3dc02bf1a99ec040988fde1425adba67da4cb (commit) via d1fec15d8148dec186e437da912d6a03a8d26b11 (commit) via d24592cbcdff03d397a185946a15b170d0cd75c9 (commit) from 30851a24ff68b00898565a1144926d83c623e6bf (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/po/ru.po | 12 +- lib/libalpm/po/zh_CN.po | 153 +++++++++++----------- lib/libalpm/trans.c | 6 +- po/ru.po | 26 ++-- po/zh_CN.po | 299 ++++++++++++++++++++--------------------- scripts/makepkg.sh.in | 4 +- scripts/pacman-optimize.sh.in | 55 +++++--- scripts/repo-add.sh.in | 4 +- 8 files changed, 286 insertions(+), 273 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-38-gcd51abf
by dan＠archlinux.org 29 Oct '08

29 Oct '08

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 cd51abf0c8d04c72cc85b28cd45b33b9020c661e (commit) via 2e431e1cc3c9bb445ea886521117f483e78aa84a (commit) via a63aeed562c8bdd6604ec50e6a4b684f6edabda3 (commit) via 2f5d7927254a760a54282d70c827768c56c657b7 (commit) via 1e656c0a6a7f2dcf5dc40f1b1027161847b967b4 (commit) via 50e3dc02bf1a99ec040988fde1425adba67da4cb (commit) via d1fec15d8148dec186e437da912d6a03a8d26b11 (commit) via d24592cbcdff03d397a185946a15b170d0cd75c9 (commit) from fa02a71abd62fc8b45e92ce1652b5d98174a6dca (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 cd51abf0c8d04c72cc85b28cd45b33b9020c661e Merge: 2e431e1cc3c9bb445ea886521117f483e78aa84a a63aeed562c8bdd6604ec50e6a4b684f6edabda3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 28 22:20:09 2008 -0500 Merge branch 'maint' commit 2e431e1cc3c9bb445ea886521117f483e78aa84a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 17 21:06:53 2008 +0200 testdb : extend the tool to allow checking sync dbs too. Example usage and output : > src/util/testdb -h usage: testdb [-b <pacman db>] : check the local database testdb [-b <pacman db>] core extra ... : check the listed sync databases > src/util/testdb Checking the integrity of the local database in /var/lib/pacman/ > src/util/testdb core extra testing community Checking the integrity of the sync databases in /var/lib/pacman/ missing dependency for archboot : bcm43xx-fwcutter>=006-2 missing dependency for xvattr : xfree86 missing dependency for eclipse-ve : eclipse<3.3 missing dependency for flumotion : twisted-web missing dependency for gg2 : arts missing dependency for man-pages-cs : groff-utf8 missing dependency for qc-usb : kernel26<2.6.26 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/ru.po | 12 +- lib/libalpm/po/zh_CN.po | 153 +++++++++++----------- lib/libalpm/trans.c | 6 +- po/ru.po | 26 ++-- po/zh_CN.po | 299 ++++++++++++++++++++--------------------- scripts/makepkg.sh.in | 4 +- scripts/pacman-optimize.sh.in | 55 +++++--- scripts/repo-add.sh.in | 4 +- src/util/testdb.c | 174 +++++++++++++++++------- 9 files changed, 412 insertions(+), 321 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translation] zh_CN
by Lyman 29 Oct '08

29 Oct '08

As attached, it is a git diff file. (Generated by "git diff po/zh_CN.po lib/libalpm/po/zh_CN.po > zh_CN", please correct me if I was wrong since I am new to git). Wish it could be useful :) Changes: * add n$ into %s to identify the sequence if there are 2 or more parameters in translated sentence * clean up fuzzy translation * some typo/format corrected Sorry for possible duplicate send since last one enclosed a uncompressed diff file which exceeded 40k limit of the mail list. -- Lyman Li http://lymanrb.blogspot.com

2 1

[pacman-dev] [PATCH] makepkg: fix updating PKGBUILD when building SCM packages
by Allan McRae 29 Oct '08

29 Oct '08

Fixes a bug and resets pkgrel to 1 when bumping pkgver Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5735891..52784b6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1094,6 +1094,7 @@ devel_check() { if [ "$newpkgver" != "" ]; then msg2 "$(gettext "Version found: %s")" "$newpkgver" pkgver=$newpkgver + pkgrel=1 fi else @@ -1113,8 +1114,9 @@ devel_update() { # _foo=pkgver # if [ "$newpkgver" != "" ]; then - if [ "newpkgver" != "$pkgver" ]; then + if [ "$newpkgver" != "$pkgver" ]; then sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT + sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT source $BUILDSCRIPT fi fi -- 1.6.0.3

2 1

[pacman-dev] [PATCH] makepkg: fix updating PKGBUILD when building SCM packages
by Allan McRae 28 Oct '08

28 Oct '08

Fixes a bug and resets pkgrel to 1 when bumping pkgver Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5735891..e8add36 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1113,8 +1113,9 @@ devel_update() { # _foo=pkgver # if [ "$newpkgver" != "" ]; then - if [ "newpkgver" != "$pkgver" ]; then + if [ "$newpkgver" != "$pkgver" ]; then sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT + sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT source $BUILDSCRIPT fi fi -- 1.6.0.3

1 1

[pacman-dev] A quiestion on translation
by Lyman 28 Oct '08

28 Oct '08

Hi, I noticed some translation flaw of pacman and wish to correct it. I followed the instruction as this link http://www.archlinux.org/pacman/translation-help.html and get the updated po file (to be exact, zh_CN.po). Here's the problem when I open this po file: I don't know how to identify parameter with sequence. For example, when I need to translate a sentence msgid ":: Replace %s with %s/%s?" into the form of msgstr ":: Use %s/%s to replace %s?" How could tell which %s is which. This does happens when translating English into Chinese and there are such bugs in zh_CN.po right now. I've searched for a while and found that different projects might use different policies. In KDE people uses msgid "%1 articles match rule %2" msgstr "匹配规则 %2 的文章有 %1 个" and in Gnome people uses msgid "%d articles match rule %d" msgstr "匹配规则 %2$d 的文章有 %1$d 个" What about pacman? Thanks. -- Lyman Li http://lymanrb.blogspot.com

3 3

[pacman-dev] [ABS PATCH] Allow syncing the ABS tree using tarballs
by Allan McRae 26 Oct '08

26 Oct '08

I figured I'd post this here for comments seem it is a fairly decent sized patch. Thanks, Allan Some people are stuck behind restrictive firewalls and can not sync the ABS tree using rsync. This patch adds support for downloading ABS snapshot tarballs from pacman mirrors. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- abs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- conf/abs.conf | 7 ++++++- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/abs b/abs index bd1191d..a369482 100755 --- a/abs +++ b/abs @@ -80,6 +80,7 @@ usage() { echo "Options:" echo " -h, --help Display this help message then exit." echo " -V, --version Display version information then exit." + echo " -t, --tarball Sync ABS tree using tarballs from your pacman mirror." echo echo "abs will synchronize PKGBUILD scripts from the Arch Linux repositories" echo "into $ABSROOT via rsync. If no argument is given, abs will synchronize" @@ -97,7 +98,7 @@ version() { echo "There is NO WARRANTY, to the extent permitted by law." } -update() { +update_rsync() { cd "$ABSROOT" if [ "$CLPARAM" = "" ]; then @@ -138,6 +139,48 @@ update() { $SYNCCMD $SYNCARGS $INCLUDE $EXCLUDE ${SYNCSERVER}::abs/${ARCH}/ $ABSROOT } +update_tarball() { + cd "$ABSROOT" + + if [ ! "$(type -p rsync)" ]; then + error "missing wget download utility. Install wget." + exit $_E_MISSING_PROGRAM + fi + + if [ -f "$MIRRORLIST" ]; then + mirrorlist=$(grep "^Server" $MIRRORLIST | cut -f3 -d" ") + else + error "Could not find pacman mirrorlist file $MIRRORLIST" + exit $_E_CONFIG_ERROR + fi + + msg "Downloading tarballs..." + for repo in "${REPOS[@]}"; do + if [ "$repo" == "${repo#!}" ]; then + echo " ==> ${repo}..." + + ret=0 + for mirror in ${mirrorlist[@]}; do + tarball=$(echo $mirror | sed "s#\$repo#$repo#") + tarball="${tarball}/${repo}.abs.tar.gz" + wget -q $tarball || ret=$? + if [ $ret -eq 0 ]; then + break + fi + done + + if [ $ret -ne 0 ]; then + echo " Download failed" + continue + fi + + rm -rf $repo + tar -xzf ${repo}.abs.tar.gz + rm ${repo}.abs.tar.gz + fi + done +} + ## # Signal Traps ## @@ -148,8 +191,8 @@ trap 'error "An unknown error has occured. Exiting..."; exit 1' ERR ## # Parse Options ## -OPT_SHORT="hV" -OPT_LONG="help,version" +OPT_SHORT="hVt" +OPT_LONG="help,version,tarball" OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then # This is a small hack to stop the script bailing with 'set -e' @@ -162,6 +205,7 @@ while true; do case "$1" in -h|--help) usage; exit $_E_OK;; -V|--version) version; exit $_E_OK;; + -t|--tarball) TARBALL=1;; --) OPT_IND=0; shift; break;; *) usage; exit $_E_INVALID_OPTION;; @@ -195,7 +239,11 @@ fi ## # Go-go Update ABS tree! ## -update +if [ "$TARBALL" ]; then + update_tarball +else + update_rsync +fi exit $_E_OK diff --git a/conf/abs.conf b/conf/abs.conf index 7d5fd79..6511a58 100644 --- a/conf/abs.conf +++ b/conf/abs.conf @@ -1,5 +1,5 @@ # -# /etc/abs/abs.conf +# /etc/abs.conf # # the top-level directory of all your PKGBUILDs @@ -17,6 +17,11 @@ SYNCSERVER="rsync.archlinux.org" ARCH="i686" # +# Pacman mirror list used for syncing via tarball +# +MIRRORLIST="/etc/pacman.d/mirrorlist" + +# # REPOS to be parsed by abs (in this order) # (prefix a repo with a ! to disable it) # -- 1.6.0.3

3 3

[pacman-dev] [PATCH] Provides a MAN_DIRS variable much like DOC/STRIP_DIRS. I need that for a package that install manpages in a non-standard place (/opt/devkitpro/devkitPPC/man/...).
by Tiago Pierezan Camargo 25 Oct '08

25 Oct '08

Signed-off-by: Tiago Pierezan Camargo <tcamargo(a)gmail.com> --- doc/makepkg.conf.5.txt | 7 +++++++ etc/makepkg.conf.in | 2 ++ scripts/makepkg.sh.in | 9 ++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ca9df02..d6dd7dd 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -136,6 +136,13 @@ Options that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. +**MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: + If "zipman" is specified in the OPTIONS array, this variable will + instruct makepkg where to look to compress manpages and docs. If you + build packages that are located in opt/, you may need to add the + directory to this array. *NOTE:* Do not add the leading slash to + the directory name. + **STRIP_DIRS=(**bin lib sbin usr/{bin,lib} ...**)**:: If "strip" is specified in the OPTIONS array, this variable will instruct makepkg where to look to for files to strip. If you build diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 7eb647b..43f03b4 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -73,6 +73,8 @@ OPTIONS=(strip !docs libtool emptydirs zipman) INTEGRITY_CHECK=(md5) #-- Doc directories to remove (if option set correctly above) DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Manpage directories to compress (if option set correctly above) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Directories to be searched for the strip option (if option set correctly above) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c15d91f..2fa64ea 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -714,9 +714,8 @@ tidy_install() { if [ "$(check_option zipman)" = "y" ]; then msg2 "$(gettext "Compressing man and info pages...")" - local manpage mandirs ext file link hardlinks hl - mandirs=({usr{,/local}{,/share},opt/*}/{man,info}) - find ${mandirs[@]} -type f 2>/dev/null | + local manpage ext file link hardlinks hl + find ${MAN_DIRS[@]} -type f 2>/dev/null | while read manpage ; do # check file still exists (potentially compressed with hard link) if [ -f ${manpage} ]; then @@ -724,7 +723,7 @@ tidy_install() { file="${manpage##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage - find ${mandirs[@]} -lname "$file" 2>/dev/null | + find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | while read link ; do rm -f "$link" ln -sf "${file}.gz" "${link}.gz" @@ -732,7 +731,7 @@ tidy_install() { # find hard links and remove them # the '|| true' part keeps the script from bailing if find returned an # error, such as when one of the man directories doesn't exist - hardlinks="$(find ${mandirs[@]} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true + hardlinks="$(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true for hl in ${hardlinks}; do rm -f "${hl}"; done -- 1.6.0.2

3 5

[pacman-dev] [PATCH] Fix memleaks in front-end caused by dynamic memory allocation
by Nagy Gabor 25 Oct '08

25 Oct '08

http://repo.or.cz/w/pacman-ng.git?a=shortlog;h=refs/heads/working I know you may not like this way (free functions public), but IMHO the result is not so ugly ;-) Off-topic: A small thing. During working on this patch I realized, that "\nerrors occurred, no packages were upgraded.\n" message is printed after -U fileconflict error only. Is this intentional? (Anyway, IMHO that message is useless.) Bye ------------------------------------------------------ SZTE Egyetemi Konyvtar - http://www.bibl.u-szeged.hu This message was sent using IMP: http://horde.org/imp/

3 3