- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/src/pacman/po (it.po)
by Dan McGee 01 Apr '07

01 Apr '07

Date: Sunday, April 1, 2007 @ 13:05:17 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: it.po (1.22 -> 1.23) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> -------+ it.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.22 pacman-lib/src/pacman/po/it.po:1.23 --- pacman-lib/src/pacman/po/it.po:1.22 Sat Mar 24 00:18:18 2007 +++ pacman-lib/src/pacman/po/it.po Sun Apr 1 13:05:16 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" -"PO-Revision-Date: 2007-03-22 12:40+0100\n" +"POT-Creation-Date: 2007-03-31 03:37+0200\n" +"PO-Revision-Date: 2007-03-31 04:00+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" "MIME-Version: 1.0\n" @@ -434,7 +434,7 @@ #: src/pacman/pacman.c:127 #, c-format msgid " required by any package\n" -msgstr " più richiesti da nessun pacchetto\n" +msgstr " ma non più richiesti da alcun pacchetto\n" #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format @@ -887,11 +887,6 @@ msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "'%s': %s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: Installare l'intero contenuto? [Y/n] " @@ -1091,6 +1086,9 @@ msgid "Total Installed Size: %.2f MB\n" msgstr "Dimensione totale dei pacchetti installati: %.2f MB\n" +#~ msgid "'%s': %s\n" +#~ msgstr "'%s': %s\n" + #~ msgid "is required by" #~ msgstr "è richiesto da"

1 0

[pacman-dev] warning: current locale is invalid...
by Andrew Fyfe 31 Mar '07

31 Mar '07

src/pacman/pacman.c line 448 Any chance this error can be sent to stderr rather than stdout, it's screwing up scripts that read in pacman output. And more to the point is it just me or does this error always come up if LC_ALL|LANG!=C|POSIX Andrew

2 1

[pacman-dev] spanish translation
by Juan Pablo González T. 31 Mar '07

31 Mar '07

Hi. I'm working in a translation of pacman to my native language, the spanish. i already done and corrected the pacman.po, and right now i'm working on libalpm.po. both for the "es" locale the reason of this mail is the next question: how can i send you my work? thank you for your patience. greetings!! __________________________________________________ Correo Yahoo! Espacio para todos tus mensajes, antivirus y antispam ¡gratis! Regístrate ya - http://correo.espanol.yahoo.com/

3 3

[pacman-dev] some notes for -h and getopt
by Nagy Gabor 31 Mar '07

31 Mar '07

Hi! Some things I noticed after my previous buggy patch: 1. After -h there are [package], <package> and <file> in many places, however [packages], <packages> and <files> would be better in most cases, so you should check and correct these. 2. I misled you by suggesting "-s <regex>" to -h. This very informative; however to be more precise, [package] (which should be [packages], see 1.; or [packages|regexes], huh ?:-) {which is in the first line (after -Sh or -Qh)} is treated as regex and this should be somehow described in the description of -s. Sorry for misleading :-( 3. Only "op" parameters are mutual now. Of course in many cases the "sub" parameters of the "op" parameters are not mutual; but after "pacman -Qls foo" not defined what will happen. I don't really care about this (I don't really like getopt either; and users are expected to use switches after thinking .-), I just warn you, that this command line is accepted now: "pacman -y foo -l -Q -s foo2" and not defined what will happen (<-Note: -y is not allowed after -Q, but accepted because allowed after -S) Bye, Nagy Gabor

1 0

[pacman-dev] [patch] Very small bug(?)fix
by Nagy Gabor 31 Mar '07

31 Mar '07

Hi! I wanted to search packages with "-Ss -hu" and I found that -hu is treated as a new switch. So here is my little patch to set that --search requires an argument. (Anyway, I could search with .*-hu :-) -------------------- --- pacman-lib/src/pacman/pacman.c.old 2007-03-31 09:26:09.000000000 +0200 +++ pacman-lib/src/pacman/pacman.c 2007-03-31 09:33:39.000000000 +0200 @@ -247,7 +247,7 @@ {"print-uris", no_argument, 0, 'p'}, {"root", required_argument, 0, 'r'}, {"recursive", no_argument, 0, 's'}, - {"search", no_argument, 0, 's'}, + {"search", required_argument, 0, 's'}, {"upgrades", no_argument, 0, 'u'}, {"sysupgrade", no_argument, 0, 'u'}, {"verbose", no_argument, 0, 'v'}, @@ -266,7 +266,7 @@ struct stat st; unsigned short logmask; - while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepiuwyg", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhs:cVfmnoldepiuwyg", opts, &option_index))) { if(opt < 0) { break; } ----------------------- Bye, Nagy Gabor

1 1

[pacman-dev] 20070331 Italian Translation
by Giovanni Scafora 31 Mar '07

31 Mar '07

Hi guys, there is a patch for italian translation. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [patch] FS#4404 - rsync protocol support for makepkg.
by Andrew Fyfe 30 Mar '07

30 Mar '07

A set of patches to add support for downloading from rsync in makepkg. Andrew >From 5248d7bfd1e37b1c332c77537d08cb1a1d58f628 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 10:58:16 +0100 Subject: [PATCH 1/3] Moved check for download client into getDownloadClient(). Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg | 91 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 55 insertions(+), 36 deletions(-) diff --git a/scripts/makepkg b/scripts/makepkg index 5afb285..0e5c5ec 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -190,6 +190,26 @@ checkdeps() { fi } +getDownloadClient () { + # $1 = Config variable name. + + local agent=$(eval echo \$$1) + if [ -z "$agent" ]; then + error "$1 is not configured. Check the /etc/makepkg.conf file." + error "Aborting..." + exit 1 # $E_CONFIG_ERROR # TODO: error code + fi + + local program="$(echo $agent | awk '{print $1 }')" + if [ ! -x "$program" ]; then + error "The download program $(basename $program) is not installed." + error "Aborting..." + exit 1 # $E_MISSING_PROGRAM # TODO: error code + fi + + echo $agent +} + handledeps() { local missingdeps=0 local deplist="$*" @@ -659,58 +679,57 @@ fi cd "$startdir" -# retrieve sources -msg "Retrieving Sources..." mkdir -p src cd "$startdir/src" + + +msg "Retrieving Sources..." for netfile in ${source[@]}; do file=$(strip_url "$netfile") if [ -f "../$file" ]; then msg2 "Found $file in build dir" cp "../$file" . + continue elif [ -f "$SRCDEST/$file" ]; then msg2 "Using cached copy of $file" cp "$SRCDEST/$file" . - else - # check for a download utility - if [ -z "$FTPAGENT" ]; then - error "FTPAGENT is not configured. Check the /etc/makepkg.conf file." - msg "Aborting..." - exit 1 - fi - ftpclient=$(echo $FTPAGENT | awk {'print $1'}) - if [ ! -x "$ftpclient" ]; then - error "ftpclient $(basename $ftpclient) is not installed." - msg "Aborting..." - exit 1 - fi - proto=$(echo "$netfile" | sed 's|://.*||') - if [ "$proto" != "ftp" -a "$proto" != "http" -a "$proto" != "https" ]; then + continue + fi + + proto=$(echo $netfile | sed 's|://.*||') + case "$proto" in + ftp|http|https) + FTPAGENT_PROGRAM=$FTPAGENT_PROGRAM # HACK ALERT! + dlclient=$(getDownloadClient FTPAGENT) || exit $?;; + + *) error "$netfile was not found in the build directory and is not a proper URL." msg "Aborting..." - exit 1 - fi - msg2 "Downloading $file" - $FTPAGENT "$netfile" - # fix flyspray bug #3289 - ftpret=$? - if [ $ftpret -gt 0 ]; then - error "Failure while downloading $file" - msg "Aborting..." - #rm "$file" - exit 1 - fi - if [ -n "$SRCDEST" ]; then - mkdir -p $SRCDEST && cp "$file" $SRCDEST - if [ $? -ne 0 ]; then - warning "You do not have correct permissions to cache source in $SRCDEST" - cp "$file" .. - fi - else + exit 1 # $E_BAD_PKGBUILD # TODO: error code + ;; + esac + + msg2 "Downloading $file" + # fix flyspray bug #3289 + ret=0 + $dlclient "$netfile" || ret=$? + if [ $ret -gt 0 ]; then + error "Failure while downloading $file" + msg "Aborting..." + exit 1 + fi + + if [ -n "$SRCDEST" ]; then + mkdir -p "$SRCDEST" && cp "$file" "$SRCDEST" || ret=$? + if [ $ret -gt 0 ]; then + warning "You do not have correct permissions to cache source in $SRCDEST" cp "$file" .. fi + else + cp "$file" .. fi done +unset netfile file dlclient proto ret if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then warning "Skipping source integrity checks -- using existing src/ tree" -- 1.5.0.5 >From 46cf6179ae0c0f4afb7c0382be82cf777cd0b6ff Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:02:09 +0100 Subject: [PATCH 2/3] Fixed FS#4404 - rsync protocol support for makepkg. Added support for rsync to getDownloadClient(). Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg b/scripts/makepkg index 0e5c5ec..87fd384 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -702,6 +702,9 @@ for netfile in ${source[@]}; do FTPAGENT_PROGRAM=$FTPAGENT_PROGRAM # HACK ALERT! dlclient=$(getDownloadClient FTPAGENT) || exit $?;; + rsync) + dlclient=$(getDownloadClient RSYNCAGENT);; + *) error "$netfile was not found in the build directory and is not a proper URL." msg "Aborting..." -- 1.5.0.5 >From 8c4c9ee8b2678fb8a63b2c1b4fa61d41bb83c686 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:03:11 +0100 Subject: [PATCH 3/3] Added RSYNCAGENT to makepkg.conf.in Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- etc/makepkg.conf.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9ac0ef2..3c0fdf8 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -10,6 +10,8 @@ FTPAGENT="/usr/bin/wget --continue --passive-ftp --tries=3 --waitretry=3 --no-check-certificate" #FTPAGENT="/usr/bin/snarf" #FTPAGENT="/usr/bin/lftpget -c" +#-- The rsync program that makepkg should use to acquire sources +RSYNCAGENT="/usr/bin/rsync" ######################################################################### # ARCHITECTURE, COMPILE FLAGS -- 1.5.0.5

2 2

[pacman-dev] CVS update of pacman-lib/src/pacman/po (hu.po)
by Dan McGee 30 Mar '07

30 Mar '07

Date: Friday, March 30, 2007 @ 15:55:08 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: hu.po (1.16 -> 1.17) * Updated Hungarian translation Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> -------+ hu.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) Index: pacman-lib/src/pacman/po/hu.po diff -u pacman-lib/src/pacman/po/hu.po:1.16 pacman-lib/src/pacman/po/hu.po:1.17 --- pacman-lib/src/pacman/po/hu.po:1.16 Sat Mar 24 00:18:18 2007 +++ pacman-lib/src/pacman/po/hu.po Fri Mar 30 15:55:05 2007 @@ -129,7 +129,7 @@ #: src/pacman/log.h:34 msgid "warning: " -msgstr "figyelmeztetés" +msgstr "figyelmeztetés: " #: src/pacman/package.c:60 msgid "Explicitly installed" @@ -270,7 +270,7 @@ #: src/pacman/package.c:180 #, c-format msgid "error calculating checksums for %s\n" -msgstr "hiba a %s ellenõrzõ összegének számítása közben\n" +msgstr "hiba a(z) %s ellenõrzõ összegének számítása közben\n" #: src/pacman/package.c:193 #, c-format @@ -615,7 +615,7 @@ #: src/pacman/pacman.c:300 #, c-format msgid "'%s' is not a valid debug level" -msgstr "a '%s' nem érvényes hibakeresési szint" +msgstr "a(z) '%s' nem érvényes hibakeresési szint" #: src/pacman/pacman.c:315 #, c-format @@ -687,7 +687,7 @@ #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "nem állapítható meg a valódi útvonal a '%s' számára: %s" +msgstr "nem állapítható meg a valódi útvonal a(z) '%s' számára: %s" #: src/pacman/query.c:119 #, c-format @@ -714,7 +714,7 @@ #: src/pacman/query.c:221 #, c-format msgid "group \"%s\" was not found\n" -msgstr "a \"%s\" csoport nem található\n" +msgstr "a(z) \"%s\" csoport nem található\n" #: src/pacman/query.c:232 msgid "no package file was specified for --file\n" @@ -752,7 +752,7 @@ #: src/pacman/remove.c:92 #, c-format msgid "failed to add target '%s' (%s)\n" -msgstr "nem sikerült a '%s' célt hozzáadni a tranzakcióhoz (%s)\n" +msgstr "nem sikerült a(z) '%s' célt hozzáadni a tranzakcióhoz (%s)\n" #: src/pacman/remove.c:106 #, c-format @@ -812,7 +812,7 @@ #: src/pacman/sync.c:223 #, c-format msgid " %s is up to date\n" -msgstr " a %s naprakész\n" +msgstr " a(z) %s naprakész\n" #: src/pacman/sync.c:345 #, c-format

1 0

[pacman-dev] Some pacman/hu.po bugfixes
by Nagy Gabor 30 Mar '07

30 Mar '07

Hi! Here is the patch: ------------------ --- pacman-lib/src/pacman/po/hu.po.old 2007-03-29 15:27:46.000000000 +0200 +++ pacman-lib/src/pacman/po/hu.po 2007-03-29 15:59:43.000000000 +0200 @@ -129,7 +129,7 @@ #: src/pacman/log.h:34 msgid "warning: " -msgstr "figyelmeztetés" +msgstr "figyelmeztetés: " #: src/pacman/package.c:60 msgid "Explicitly installed" @@ -270,7 +270,7 @@ #: src/pacman/package.c:180 #, c-format msgid "error calculating checksums for %s\n" -msgstr "hiba a %s ellenőrző összegének számítása közben\n" +msgstr "hiba a(z) %s ellenőrző összegének számítása közben\n" #: src/pacman/package.c:193 #, c-format @@ -615,7 +615,7 @@ #: src/pacman/pacman.c:300 #, c-format msgid "'%s' is not a valid debug level" -msgstr "a '%s' nem érvényes hibakeresési szint" +msgstr "a(z) '%s' nem érvényes hibakeresési szint" #: src/pacman/pacman.c:315 #, c-format @@ -687,7 +687,7 @@ #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "nem állapítható meg a valódi útvonal a '%s' számára: %s" +msgstr "nem állapítható meg a valódi útvonal a(z) '%s' számára: %s" #: src/pacman/query.c:119 #, c-format @@ -714,7 +714,7 @@ #: src/pacman/query.c:221 #, c-format msgid "group \"%s\" was not found\n" -msgstr "a \"%s\" csoport nem található\n" +msgstr "a(z) \"%s\" csoport nem található\n" #: src/pacman/query.c:232 msgid "no package file was specified for --file\n" @@ -752,7 +752,7 @@ #: src/pacman/remove.c:92 #, c-format msgid "failed to add target '%s' (%s)\n" -msgstr "nem sikerült a '%s' célt hozzáadni a tranzakcióhoz (%s)\n" +msgstr "nem sikerült a(z) '%s' célt hozzáadni a tranzakcióhoz (%s)\n" #: src/pacman/remove.c:106 #, c-format @@ -812,7 +812,7 @@ #: src/pacman/sync.c:223 #, c-format msgid " %s is up to date\n" -msgstr " a %s naprakész\n" +msgstr " a(z) %s naprakész\n" #: src/pacman/sync.c:345 #, c-format --------------------

2 2

[pacman-dev] Git guide for pacman
by Dan McGee 30 Mar '07

30 Mar '07

I put this together last night and today to help everyone out with GIT usage. It is meant to be a overview, not a "step-by-step type exactly what I say" type of thing. Let me know if it is helpful, unhelpful, and what needs to be made more clear. I don't want to make it much more complex then this- once you understand the basics, you should start picking up the power of git on your own. -Dan ================= Super quick GIT guide This isn't meant to be an all-encompassing guide by any means- it is meant to be a really quick walk-through on how to do some basic operations on the pacman codebase in git, such as submitting a patch. For more extensive tutorials, check out the following: http://www.kernel.org/pub/software/scm/git/docs/tutorial.html www.kernel.org/pub/software/scm/git/docs/everyday.html http://wiki.winehq.org/GitWine (talks a lot about maintaining patches) In addition, all git commands have decent manpages to refer to. They can be reached one of two ways- for the git-add command, type 'man git-add' or 'git help add'. =Getting Started= The first step with git is cloning a remote repository. This is known in the CVS and SVN camps as checking out. GIT checkout has a different purpose, but that will be covered later. To grab the pacman source, run the following: git clone http://code.toofishes.net/gitprojects/pacman.git This will check out a local copy of the repository for you. This means you have the FULL history of the project on your computer, not just the most recent revision. This allows you to get work done even when offline, for example. The first steps after cloning may be just to look around. If you have read the tutorials mentioned above, even if you do not understand everything in them, you will be much better off. You will probably want to set up your name and email address for use in commit logs: git repo-config user.name "Your Name" git repo-config user.email "me(a)example.com" If you pass the '--global' flag to the above commands, the name and email will be stored in ~/.gitconfig, so will be used for all git projects unless overridden by a setting in the individual project. To update your local repository with any new branches, run 'git pull'. =Next Steps= 'git branch' will show you a list of branches. Initially, master is the only branch. However, if you pulled from a remote repo, you may have grabbed other branches- these can be seen with 'git branch -r'. Read the manpage for details. When working with git, it is good practice to never do your work on the master branch. This should stay clean to allow you to run 'git pull' and ensure that conflicts do not happen on the update. To create your own working branch, do the following (naming it whatever your heart desires): git branch working git checkout working Or compress the above into one command: git checkout -b working I highly recommend you read the man page for both of these commands. 'git-status' is highly helpful, read up on that too. =Making a patch= Woo! You found a bug in pacman (what a surprise) and know how to fix it. Ensure you have your working branch checked out ('git checkout working'). Then edit the file(s) you need in order to make your changes. Compiling is a good idea to ensure your patch didn't break anything, and if it is a big change, running 'make check' is highly recommended. So what do you do now? First, run 'git status'. You should see a list or even a few lists of files. The descriptions by each are a bit confusing, but you should be able to figure it out. GIT takes a different approach than CVS or SVN to committing changes- it doesn't commit a thing by default. You have to tell it what to commit, usually by running 'git add <filename>'. At this point, the file in its current state will be sent to a staging area for the commit. If you go back and change something in the file, you will have to git-add it again if you want the changes to be reflected in the commit. To commit your patch to your branch: git add <all edited files> git commit -s When writing a commit message, keep the following in mind. The first line is used as a patch summary- keep it short and concise. Next, skip a line and type out a full description of what your patch does. By full, I don't mean long- if you described everything in the summary line, then don't even bother with a message. Finally, skip one more line and you will have your Signed-off-by. This should have been automatically added by passing the '-s' parameter to 'git commit'. There is one more important step before submission. Because git is distributed, you don't have the most current version of the repository unless you go out and get it. In the easiest case, this is just running 'git pull'. You also want to make sure your patches are based off the most recent revision, known as the 'head'. To do this, checkout your branch with your patches, and use the following command: git rebase master To visualize what the above command did, qgit can be very helpful. To format a patch for email submission and review: git format-patch master This command will format all patches that make up the difference between your working branch and the master branch. They will be saved in the local directory; to store them elsewhere read up on the '-o' option. =Fixing your patch= So you sent off your patch to the ML and you got a few suggestions back. How does one fix it? Hopefully you did it on a branch and not the master branch, otherwise you are going to have a much tougher time. :) If it was the last patch on a branch: (edit the required files) git add <edited files> git commit --append -s If it was deeper in your patch tree: (ensure you are in the branch you wish to edit) git checkout -b tmp HEAD~<number> (where number is how far back you want to go, use 'git log' to determine) git reset HEAD^ (edit the required files) git commit -s -c ORIG_HEAD git rebase --onto tmp working~<number> working (replace working with your current working branch) git branch -D tmp http://wiki.winehq.org/GitWine has good information on the above, that is where most of this came from. After fixing your patch, you will probably want to rebase it as described above, and then use format-patch to submit it again. =Further reading= Commands you will definitely want to be knowledgeable on: clone (only once!), branch, checkout, status, pull, fetch, diff, add, commit, rebase, format-patch =Helpful Hints= 'git' itself is a wrapper script that calls the other commands. Thus, git-add can be called with either 'git add' or 'git-add'. qgit in extra is a great GUI viewer for git repositories. In addition, read up on 'git-instaweb'. Keep typing 'git co' instead of 'git checkout'? Try this: git config --global alias.co checkout

5 6

[pacman-dev] CVS update of pacman-lib/src/pacman/po (ru_RU.po)
by Dan McGee 30 Mar '07

30 Mar '07

Date: Friday, March 30, 2007 @ 14:06:04 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: ru_RU.po (1.7 -> 1.8) * Updated Russian translation Владимир Байраковский <4rayven(a)gmail.com> ----------+ ru_RU.po | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) Index: pacman-lib/src/pacman/po/ru_RU.po diff -u pacman-lib/src/pacman/po/ru_RU.po:1.7 pacman-lib/src/pacman/po/ru_RU.po:1.8 --- pacman-lib/src/pacman/po/ru_RU.po:1.7 Mon Mar 26 18:47:57 2007 +++ pacman-lib/src/pacman/po/ru_RU.po Fri Mar 30 14:06:04 2007 @@ -134,7 +134,7 @@ #: src/pacman/package.c:60 msgid "Explicitly installed" -msgstr "Неявно установлен" +msgstr "Явно установлен" #: src/pacman/package.c:63 msgid "Installed as a dependency for another package" @@ -173,7 +173,7 @@ #: src/pacman/package.c:78 src/pacman/package.c:130 msgid "Provides :" -msgstr "Обеспечивает :" +msgstr "Предоставляет :" #: src/pacman/package.c:79 src/pacman/package.c:131 msgid "Depends On :" @@ -311,32 +311,32 @@ #: src/pacman/pacman.c:92 #, c-format msgid " %s {-A --add} [options] <file>\n" -msgstr " %s {-A --add} [опции] <файл>\n" +msgstr " %s {-A --add} [параметры] <файл>\n" #: src/pacman/pacman.c:93 #, c-format msgid " %s {-F --freshen} [options] <file>\n" -msgstr " %s {-F --freshen} [опции] <файл>\n" +msgstr " %s {-F --freshen} [параметры] <файл>\n" #: src/pacman/pacman.c:94 #, c-format msgid " %s {-Q --query} [options] [package]\n" -msgstr " %s {-Q --query} [опции] [пакет]\n" +msgstr " %s {-Q --query} [параметры] [пакет]\n" #: src/pacman/pacman.c:95 #, c-format msgid " %s {-R --remove} [options] <package>\n" -msgstr " %s {-R --remove} [опции] <пакет>\n" +msgstr " %s {-R --remove} [параметры] <пакет>\n" #: src/pacman/pacman.c:96 #, c-format msgid " %s {-S --sync} [options] [package]\n" -msgstr " %s {-S --sync} [опции] [пакет]\n" +msgstr " %s {-S --sync} [параметры] [пакет]\n" #: src/pacman/pacman.c:97 #, c-format msgid " %s {-U --upgrade} [options] <file>\n" -msgstr " %s {-U --upgrade} [опции] <файл>\n" +msgstr " %s {-U --upgrade} [параметры] <файл>\n" #: src/pacman/pacman.c:98 #, c-format @@ -351,13 +351,13 @@ #: src/pacman/pacman.c:101 #, c-format msgid "usage: %s {-A --add} [options] <file>\n" -msgstr "использование: %s {-A --add} [опции] <файл>\n" +msgstr "использование: %s {-A --add} [параметры] <файл>\n" #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138 #, c-format msgid "options:\n" -msgstr "опции:\n" +msgstr "параметры:\n" #: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 #: src/pacman/pacman.c:140 @@ -375,7 +375,7 @@ #: src/pacman/pacman.c:106 #, c-format msgid "usage: %s {-R --remove} [options] <package>\n" -msgstr "использование: %s {-R --remove} [опции] <пакет>\n" +msgstr "использование: %s {-R --remove} [параметры] <пакет>\n" #: src/pacman/pacman.c:108 #, c-format @@ -407,17 +407,17 @@ #: src/pacman/pacman.c:115 #, c-format msgid "usage: %s {-F --freshen} [options] <file>\n" -msgstr "использование: %s {-F --freshen} [опции] <файл>\n" +msgstr "использование: %s {-F --freshen} [параметры] <файл>\n" #: src/pacman/pacman.c:117 #, c-format msgid "usage: %s {-U --upgrade} [options] <file>\n" -msgstr "использование: %s {-U --upgrade} [опции] <файл>\n" +msgstr "использование: %s {-U --upgrade} [параметры] <файл>\n" #: src/pacman/pacman.c:123 #, c-format msgid "usage: %s {-Q --query} [options] [package]\n" -msgstr "использование: %s {-Q --query} [опции] [пакет]\n" +msgstr "использование: %s {-Q --query} [параметры] [пакет]\n" #: src/pacman/pacman.c:125 #, c-format @@ -468,7 +468,7 @@ #, c-format msgid " -p, --file <package> query a package file instead of the database\n" msgstr "" -" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " +" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " "базы данных\n" #: src/pacman/pacman.c:134 @@ -477,7 +477,7 @@ " -s, --search <regex> search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search <regex> искать указанную строку в локально установленных " +" -s, --search <regex> искать указанную строку в локально установленных " "пакетах\n" #: src/pacman/pacman.c:135 @@ -490,7 +490,7 @@ #: src/pacman/pacman.c:137 #, c-format msgid "usage: %s {-S --sync} [options] [package]\n" -msgstr "использование: %s {-S --sync} [опции] [пакет]\n" +msgstr "использование: %s {-S --sync} [параметры] [пакет]\n" #: src/pacman/pacman.c:139 #, c-format @@ -539,8 +539,7 @@ " -w, --downloadonly download packages but do not install/upgrade " "anything\n" msgstr "" -" -w, --downloadonly загрузить пакеты с сервера, но ничего не " -"устанавливать и не обновлять\n" +" -w, --downloadonly загрузить пакеты с сервера, но не устанавливать\n" #: src/pacman/pacman.c:150 #, c-format @@ -642,7 +641,7 @@ #: src/pacman/pacman.c:363 #, c-format msgid "'%s' is not a valid root path\n" -msgstr "'%s' не является верным корневым каталогом\n" +msgstr "некорректный корневой каталог: '%s'\n" #: src/pacman/pacman.c:390 msgid "only one operation may be used at a time\n" @@ -659,12 +658,13 @@ #: src/pacman/pacman.c:489 msgid "you cannot perform this operation unless you are root.\n" -msgstr "Вы не можете выполнить эту операцию если вы не root.\n" +msgstr "" +"Вы не можете выполнить эту операцию не являясь суперпользователем (root).\n" #: src/pacman/pacman.c:505 #, c-format msgid "failed to parse config (%s)\n" -msgstr "не удалось разобрать конфигурационный файл (%s)\n" +msgstr "не удалось обработать конфигурационный файл (%s)\n" #: src/pacman/pacman.c:516 msgid "Targets :" @@ -673,15 +673,15 @@ #: src/pacman/pacman.c:522 #, c-format msgid "could not register 'local' database (%s)\n" -msgstr "не могу зарегистрировать 'локальную' базу данных (%s)\n" +msgstr "не могу зарегистрировать локальную базу данных (%s)\n" #: src/pacman/pacman.c:529 msgid "no targets specified (use -h for help)\n" -msgstr "не задано целей (для помощи используйте -h)\n" +msgstr "не задано целей (для справки используйте -h)\n" #: src/pacman/pacman.c:542 msgid "no operation specified (use -h for help)\n" -msgstr "не указаны конкретные операции (для помощи используйте -h)\n" +msgstr "не задана операция (для справки используйте -h)\n" #: src/pacman/query.c:90 msgid "no file was specified for --owns\n" @@ -730,7 +730,7 @@ #: src/pacman/query.c:232 msgid "no package file was specified for --file\n" -msgstr "не указан файл пакета для опции --file\n" +msgstr "не указан файл пакета для параметра --file\n" #: src/pacman/query.c:236 #, c-format @@ -852,7 +852,7 @@ #: src/pacman/sync.c:491 msgid "synchronizing package lists" -msgstr "синхронизирую список пакетов" +msgstr "синхронизирую списки пакетов" #: src/pacman/sync.c:493 msgid "failed to synchronize any databases" @@ -884,7 +884,7 @@ #: src/pacman/sync.c:522 msgid ":: Upgrade pacman first? [Y/n] " -msgstr ":: Сначала обновить pacman? [Y/n] " +msgstr ":: Обновить pacman в первую очередь? [Y/n] " #: src/pacman/sync.c:537 #, c-format @@ -908,7 +908,7 @@ #: src/pacman/sync.c:603 #, c-format msgid "'%s': not found in sync db\n" -msgstr "'%s': не найдено в базе данных\n" +msgstr "'%s': не найдено в базе пакетов\n" #: src/pacman/sync.c:621 msgid "requires"

1 0

[pacman-dev] pacman return values
by bardo 30 Mar '07

30 Mar '07

I noticed that pacman3 returns 0 on query (-Q, -Si) even if the package doesn't exist. I have no CVS access ATM, so I can't check out if this has been fixed... bardo

3 3

[pacman-dev] DB-Fix for dup Required-By
by Travis Willard 30 Mar '07

30 Mar '07

Hi all, If you're like me and have been installing the pacman3 RC's to help test, you may have been bitten by a bug that caused "Required By" entries in the local pacman DB to become duplicated, resulting in something that may have looked like this: ----------8<----------8<----------8<----------8<----------8< $ pacman -Qi xorg-server Name : xorg-server Version : 1.2.0-3 ...blah blah... Required By : ati-fglrx-utils xorg xorg xorg xorg ----------8<----------8<----------8<----------8<----------8< While harmless, I found this annoying after a while, so I whipped up a script to scan the DB for these discrepancies, collect a list of affected packages, then pacman -S them all to fix it up. I've tested this script a few times on my own system, seems to do the job correctly, though one line is a bit of a hack. ;) As always, "Use at your own risk!", although I think it's perfectly safe to use - the very worst I can imagine that can happen is that you'll reinstall a few packages you didn't need to. -- Travis

2 1

[pacman-dev] Russian translation update
by Владимир Байраковский 30 Mar '07

30 Mar '07

Hi! This is a new patch for src/pacman/po/ru_RU.po with some improvements.

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (util.c)
by Aaron Griffin 30 Mar '07

30 Mar '07

Date: Friday, March 30, 2007 @ 00:46:17 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: util.c (1.51 -> 1.52) commit 1d35c4dcc6399023217e41eaa8ff4733b1ad2b0d Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Mar 29 22:44:10 2007 -0500 Report an error on setmntent failure Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> --------+ util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.51 pacman-lib/lib/libalpm/util.c:1.52 --- pacman-lib/lib/libalpm/util.c:1.51 Thu Mar 22 04:22:48 2007 +++ pacman-lib/lib/libalpm/util.c Fri Mar 30 00:46:17 2007 @@ -560,11 +560,13 @@ static long long get_freespace() { struct mntent *mnt; - char *table = MOUNTED; + const char *table = MOUNTED; FILE *fp; long long ret=0; if((fp = setmntent(table, "r")) == NULL) { + _alpm_log(PM_LOG_ERROR, _("cannot read disk space information from %s: %s"), + table, strerror(errno)); return(-1); }

1 0

[pacman-dev] CVS update of pacman-lib/scripts (repo-add)
by Aaron Griffin 30 Mar '07

30 Mar '07

Date: Thursday, March 29, 2007 @ 23:33:19 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: repo-add (1.6 -> 1.7) commit 970d2e942eb29bf78fe89895ace4d781970b6e94 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Mar 29 21:30:40 2007 -0500 repo-add leaves .PKGINFO in the current directory * Misuse of 'tar xf', which should be 'tar tf' Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> ----------+ repo-add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/repo-add diff -u pacman-lib/scripts/repo-add:1.6 pacman-lib/scripts/repo-add:1.7 --- pacman-lib/scripts/repo-add:1.6 Tue Mar 13 11:01:15 2007 +++ pacman-lib/scripts/repo-add Thu Mar 29 23:33:19 2007 @@ -246,7 +246,7 @@ fi else if [ -f "$arg" ]; then - if ! tar xf "$arg" .PKGINFO 2>&1 >/dev/null; then + if ! tar tf "$arg" .PKGINFO 2>&1 >/dev/null; then echo "error: '$arg' is not a package file, skipping" else echo ":: adding package '$arg'"

1 0

[pacman-dev] [patch] makepkg (actually tar) can't extract .tar.Z archives.
by Andrew Fyfe 30 Mar '07

30 Mar '07

Found a bug last night when trying to build rcs, 'tar -xf' doesn't work when trying to extract .tar.Z archives. You need to use 'tar -xzf'. Patch attached. Andrew >From 2d6993d638a46da68c23927e609000764c4b2b0c Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:11:36 +0100 Subject: [PATCH 1/1] Fix bug where makepkg can't extract .tar.Z archives. For some reason 'tar -xf' doesn't work with .tar.Z, you need to use 'tar -xzf' to extract the archive. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg b/scripts/makepkg index 5afb285..92d8ab2 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -809,6 +809,8 @@ else file_type=$(file -biz "$file") unset cmd case "$file_type" in + *application/x-tar*application/x-compress*) + cmd="tar -xzf $file" ;; *application/x-tar*) cmd="tar -xf $file" ;; *application/x-zip*) -- 1.5.0.5

2 1

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 30 Mar '07

30 Mar '07

Date: Thursday, March 29, 2007 @ 23:24:10 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.65 -> 1.66) From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:11:36 +0100 Subject: [PATCH 1/1] Fix bug where makepkg can't extract .tar.Z archives. For some reason 'tar -xf' doesn't work with .tar.Z, you need to use 'tar -xzf' to extract the archive. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> ---------+ makepkg | 2 ++ 1 file changed, 2 insertions(+) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.65 pacman-lib/scripts/makepkg:1.66 --- pacman-lib/scripts/makepkg:1.65 Sun Mar 25 13:37:43 2007 +++ pacman-lib/scripts/makepkg Thu Mar 29 23:24:09 2007 @@ -809,6 +809,8 @@ file_type=$(file -biz "$file") unset cmd case "$file_type" in + *application/x-tar*application/x-compress*) + cmd="tar -xzf $file" ;; *application/x-tar*) cmd="tar -xf $file" ;; *application/x-zip*)

1 0

[pacman-dev] handling of provides/conflicts packages
by Scott Horowitz 29 Mar '07

29 Mar '07

So here's the scenario: mplayer is in current, mplayer-svn is in unstable. mplayer-svn provides and conflicts with mplayer. As is typically the case with packages in current, mplayer has no provides or conflicts for packages outside of current/extra (mplayer-svn in this case). If you have mplayer-svn installed and try to install mplayer, you get the following: $ pacman -S mplayer resolving dependencies... done. looking for inter-conflicts... :: mplayer conflicts with mplayer-svn. Remove mplayer-svn? [Y/n] y done. error: failed to prepare transaction (could not satisfy dependencies) :: mplayer-svn requires acidrip :: mplayer-svn requires mplayer-plugin First off, I think that "done" is probably a bug - mplayer-svn wasn't removed ;-) And secondly, it seems like pacman should be able to handle this swap of mplayer-svn->mplayer even when the mplayer pkgbuild doesn't have the provided/conflicts array set. I mean, if mplayer-svn provides mplayer, doesn't it imply the reverse? I obviously don't understand the technical details, but this behavior seems "broken" to me. Scott

5 6

[pacman-dev] handling of provides/conflicts
by Scott Horowitz 29 Mar '07

29 Mar '07

Scenario: mplayer-svn is in unstable, mplayer is in current. mplayer-svn has provides/conflicts for mplayer, mplayer does not for mplayer-svn (it seems typical that packages in current don't deal with packages outside of current/extra). If I have mplayer-svn installed and try to install mplayer, I get the following: $ pacman -S mplayer resolving dependencies... done. looking for inter-conflicts... :: mplayer conflicts with mplayer-svn. Remove mplayer-svn? [Y/n] done. error: failed to prepare transaction (could not satisfy dependencies) :: mplayer-svn requires acidrip :: mplayer-svn requires mplayer-plugin (First, two minor problems. The "done" is very confusing - I assume it's from the inter-conflicts statement, but it reads as removing mplayer-svn is done. Also, the "mplayer-svn requires acidrip" should read "acidrip requires mplayer-svn" (sorry yankees26).) But the point is that this behavior seems "broken" to me. Surely if mplayer-svn provides mplayer, you should be able to swap mplayer-svn for mplayer. Scott

3 3

[pacman-dev] Roadmap for 3.1
by Aaron Griffin 29 Mar '07

29 Mar '07

Looks like it's time to move towards a 3.1 release. Dan and I both have a lot of items listed in our TODO lists, though most of them are code changes (doesn't affect the end user much). So I'd like to open the floor up for ideas - what *functional* changes interest you all, as a user of pacman? I'm going to take some input here, and then compose a list of what I'd like to do for the 3.1 release. Keep in mind that, going forward, I'd like to do quick, smaller releases (every 1-2 months would be ideal) so not everything will get done right away. Also, as a side note, we're probably going to be moving to using git for development - making it easier for other users to contribute patches and things like that (still kinda pending on some side projects I'm working on, but I digress). Anyway, let me know. Thanks, Aaron

9 20

[pacman-dev] [patch] Spell check for PKGBUILDs :p (aka check-buildscript)
by Andrew Fyfe 29 Mar '07

29 Mar '07

I was looking at the commented out code in makepkg to unset all vars in PKGBUILD before including and I think I've cracked it. So I went to test it on arch's main, extra and unstable repo, and there's several PKGBUILDs with miss spelled vars. As a result I've created check-buildscript, this just runs some sanity/spell checks on a PKGBUILD script. People should run it before submitting a PKGBUILD. Andrew >From 1d77fdf087d37ed839c892484df26c471ed79f9a Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 16:24:59 +0100 Subject: [PATCH 1/1] Added check-buildscript check-buildscript does some basic sanity checks on a build script. People should run check-buildscript before they submit a build script. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/Makefile.am | 3 +- scripts/check-buildscript | 261 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+), 1 deletions(-) create mode 100755 scripts/check-buildscript diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 57baee4..68d9ff6 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -4,6 +4,7 @@ bin_SCRIPTS = \ abs \ + check-buildscript \ gensync \ makepkg \ makeworld \ @@ -15,4 +16,4 @@ bin_SCRIPTS = \ EXTRA_DIST = $(bin_SCRIPTS) -abs gensync makepkg makeworld pacman-optimize rankmirrors repo-add repo-remove re-pacman updatesync: +abs check-buildscript gensync makepkg makeworld pacman-optimize rankmirrors repo-add repo-remove re-pacman updatesync: diff --git a/scripts/check-buildscript b/scripts/check-buildscript new file mode 100755 index 0000000..fddd2bf --- /dev/null +++ b/scripts/check-buildscript @@ -0,0 +1,261 @@ +#!/bin/bash +# +# check-buildscript - checks build script for errors. +# +# Copyright (c) 2007 by Andrew Fyfe <andrew(a)neptune-one.net> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. +# + +# TODO: _PACMAN_VERSION needs to match version of pacman package. +# some autoconf foo is needed. +_PACMAN_VERSION='3.0.0' +_VERSION='1.0' +_BUG_REPORT_EMAIL='pacman-dev(a)archlinux.org' + +BUILDSCRIPT='PKGBUILD' + +set -e +trap 'echo -e "\033[1;31mBANG! \033[1;37mThat didnt sound good. \033[1;33m:(\033[1;0m" >&2' ERR + +_DEFAULT_VARS=(pkgname pkgver pkgrel pkgdesc arch url license depends + makedepends provides conflicts replaces backup install + options source noextract md5sums sha1sums groups) + +E_OK=0 +E_UNKNOWN=1 +E_BUILDSCRIPT_ERROR=2 +E_HAS_WARNINGS=4 + +_WARNINGS=0 + +# Source makepkg.conf; fail if it is not found +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + error "/etc/makepkg.conf not found. cannot continue" + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi + +# Source user-specific makepkg.conf overrides +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf + +plain() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e " \033[1;37m$1\033[1;0m" >&2 + else + echo " $1" >&2 + fi +} + +msg() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e "\033[1;32m==> \033[1;37m$1\033[1;0m" >&2 + else + echo "==> $1" >&2 + fi +} + +msg2() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e " \033[1;34m-> \033[1;37m$1\033[1;0m" >&2 + else + echo " -> $1" >&2 + fi +} + +warning() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e "\033[1;33m==> WARNING: \033[1;37m$1\033[1;0m" >&2 + else + echo "==> WARNING: $1" >&2 + fi +} + +error() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e "\033[1;31m==> ERROR: \033[1;37m$1\033[1;0m" >&2 + else + echo "==> ERROR: $1" >&2 + fi +} + +in_array() { + local needle=$1 + shift 1 + [ -z "$1" ] && return 1 + for i in $*; do + [ "$i" = "$needle" ] && return 0 + done + return 1 +} + +# check if option is present in BUILDENV +check_buildenv() { + local needle=$(echo $1 | tr [:upper:] [:lower:]) + local i + # use options from makepkg.conf + for i in ${BUILDENV[@]}; do + local lc=$(echo $i | tr [:upper:] [:lower:]) + if [ "$lc" = "$needle" ]; then + echo "y" + return + elif [ "$lc" = "!$needle" ]; then + echo "n" + return + fi + done + echo "unknown" + return +} + +usage () { + cat << EOF +check-buildscript version $_VERSION + +Usage: $0 [options] [build script] + +Options: + -m, --nocolor Disable colourized output messages. + + -h, --help Display this help then exit. + -V, --version Output version information then exit. + +If no build script is specified on the command line then +check-buildscript will check ./$BUILDSCRIPT + +Report bugs to <${_BUG_REPORT_EMAIL}> + +EOF +} + +version () { + echo "check-buildscript $_VERSION" + echo "pacman $_PACMAN_VERSION" +} + +check_hasBuild () { + msg2 "Checking for build() function..." + if ! grep -q ' *build *' $_BUILDSCRIPT; then + error "The build() function was not found." + plain "Please make sure you have a build() function in your build script." + exit $E_BUILDSCRIPT_ERROR + fi +} + +check_varNames () { + msg2 "Checking variable names..." + + local count=$(( \ + $(grep -n 'build *()' "$_BUILDSCRIPT" | cut -d : -f 1) )) + local vars="$(head -n $count "$_BUILDSCRIPT" | \ + grep '^[A-Za-z0-9\-\_]*=.*' | \ + sed 's/^$[A-Za-z0-9\-\_]*$=.*/\1/')" + + [ -z "$vars" ] && return + + local var extra_vars + for var in $vars; do + ! in_array $var ${_DEFAULT_VARS[@]} && extra_vars="$extra_vars $var" + done + + if [ -n "$extra_vars" ]; then + _WARNINGS=$(($_WARNINGS + 1)) + warning "$_BUILDSCRIPT contains the following non standard variables:" + + for var in $extra_vars; do + msg2 "$var" + done + + plain "" + plain "Please make sure these aren't misspelled variables." + plain "If they aren't just ignore this warning." + plain "" + fi +} + +check_hasChecksums () { + msg2 "Checking for checksums..." + + if [ "$(source "$_BUILDSCRIPT"; \ + [ -z "$md5sums" -a -z "$sha1sums" ] || \ + [ "$md5sums" = "generate" -a -z "$sha1sums" ]; \ + echo $?)" -eq 0 ]; then + _WARNINGS=$(($_WARNINGS + 1)) + warning "$_BUILDSCRIPT contains no checksums for the source files." + plain "Unless this package gets its source from cvs/svn please run" + plain "makepkg -g >>PKGBUILD" + plain "" + fi +} + + +## Begin script... +_OPT_SHORT="mhV" +_OPT_LONG="nocolor,help,version" +_OPT_TEMP="$(getopt -o $_OPT_SHORT --long $_OPT_LONG -n "$0" -- "$@" || true)" +eval set -- "$_OPT_TEMP" +unset _OPT_SHORT _OPT_LONG _OPT_TEMP + +while true; do + case $1 in + -m|--nocolor) USE_COLOR='n';; + + -h|--help) usage; exit $E_OK;; + -V|--version) version; exit $E_OK;; + + --) OPTIND=0; shift; break;; + *) usage; exit $E_UNKNOWN;; + esac +done + +if [ $# -eq 0 ]; then + if [ ! -r "$BUILDSCRIPT" ]; then + usage + exit $E_UNKNOWN + fi + + _FILES=$BUILDSCRIPT +else + _FILES=$* +fi + +for _BUILDSCRIPT in $_FILES; do + if [ ! -r "$_BUILDSCRIPT" ]; then + error "Unable to find $_BUILDSCRIPT" + exit $E_UNKNOWN + fi + + msg "Checking ${_BUILDSCRIPT}..." + + check_hasBuild + check_varNames + check_hasChecksums +done + +plain "" +if [ $_WARNINGS -eq 0 ]; then + msg "Your build script(s) looks ok. \033[1;33m:)" + exit $E_OK +elif [ $_WARNINGS -eq 1 ]; then + warning "There might be a problem. There was 1 warning." + exit $E_HAS_WARNINGS +else + warning "There might be a problem. There were $_WARNINGS warnings." + exit $E_HAS_WARNINGS +fi + +# vim:set ts=4 noet: -- 1.5.0.6

3 4

[pacman-dev] Package/repo priority
by Nagy Gabor 29 Mar '07

29 Mar '07

Hi! AFAIK, if a 'foo' package exists in more than one repo (both in extra and testing for example), then the repo which the package will be installed from is undefined (probably the first repo in pacman.conf). That would be nice, if we somehow could choose our source repo for 'foo'. I don't know how can this be implemented easily, but some suggestions: 'pacman -S repo/foo' or an option to change repo-priority (which is probably defined by their order in pacman.conf) or pacman could ask the user which package is going to be installed (however, this can be annoying). You may say that I shouldn't use 2 "intersecting" repos, but similar problem occurs in case of (multiple) provided packages, where "ask" seems to be the only usable solution. Anyway, using multiple repos can be useful (but not so efficient now): For example I'm using current, extra and community repos; yes, sometimes there are some buggy packages in current, it these cases that would be comfortable, if I can easily override my default current repo to 0.7.1 for example and downgrading my package or trying a newer one from testing. Bye, Nagy Gabor One more addition to the last example: Some mirrors keep older versions of packages, for example see ftp://ftp.estpak.ee/pub/archlinux/current/os/i686/, and it would be handy if there would be an other db to these repos (which would contain all older versions of packages), and here comes to picture the multiple packages problem again. For example in these cases the latest version should be the default target and user could override this.

3 5

[pacman-dev] [patch] makepkg3 -- Reduced fakeroot usage (take 2)
by Andrew Fyfe 29 Mar '07

29 Mar '07

Hi, The last set of patches were made late at night and contain several bugs. So I've redone them. I've split the patches up a bit more as well to make the changes clearer. The *-move.patch files just move large chunks into functions, the *-cleanup.patch files remove the fakeroot code. The number at the beginning denotes what order the patches should be applied in. I've tested these patches out against my base repo and all works as expected. It should fix all the fakeroot problems people are having, how ever I've never encountered the problem described on FS#6208. Andrew ------------------------------------------------------------ revno: 4 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-create_package timestamp: Sun 2007-03-25 13:25:18 +0100 message: * Moved create package commands into create_package() diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:34:35.489021785 +0100 +++ new/scripts/makepkg 2007-03-25 19:35:55.929605832 +0100 @@ -348,6 +348,95 @@ fi } +create_package () { + # get some package meta info + builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") + if [ "$PACKAGER" != "" ]; then + packager="$PACKAGER" + else + packager="Arch Linux (http://www.archlinux.org)" + fi + size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}') + + # build a filelist - do this first to keep meta files out of the list + msg "Generating .FILELIST file..." + cd "$startdir/pkg" + tar cvf /dev/null * | sort >.FILELIST + + # write the .PKGINFO file + msg "Generating .PKGINFO file..." + cd "$startdir/pkg" + echo "# Generated by makepkg $myver" >.PKGINFO + echo -n "# " >>.PKGINFO + date >>.PKGINFO + echo "pkgname = $pkgname" >>.PKGINFO + echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO + echo "pkgdesc = $pkgdesc" >>.PKGINFO + echo "url = $url" >>.PKGINFO + echo "builddate = $builddate" >>.PKGINFO + echo "packager = $packager" >>.PKGINFO + echo "size = $size" >>.PKGINFO + if [ "$CARCH" != "" ]; then + echo "arch = $CARCH" >>.PKGINFO + fi + + for it in "${license[@]}"; do + echo "license = $it" >>.PKGINFO + done + for it in "${replaces[@]}"; do + echo "replaces = $it" >>.PKGINFO + done + for it in "${groups[@]}"; do + echo "group = $it" >>.PKGINFO + done + for it in "${depends[@]}"; do + echo "depend = $it" >>.PKGINFO + done + for it in "${conflicts[@]}"; do + echo "conflict = $it" >>.PKGINFO + done + for it in "${provides[@]}"; do + echo "provides = $it" >>.PKGINFO + done + for it in "${backup[@]}"; do + echo "backup = $it" >>.PKGINFO + done + + # TODO maybe remove this at some point + # warn if license array is not present or empty + if [ "$license" = "" ]; then + warning "Please add a license line to your $BUILDSCRIPT!" + plain "example for GPL'ed software: license=('GPL')." + fi + + # check for an install script + if [ "$install" != "" ]; then + msg "Copying install script..." + cp "$startdir/$install" "$startdir/pkg/.INSTALL" + fi + + # do we have a changelog? + have_changelog=0 + if [ -f "$startdir/ChangeLog" ]; then + msg "Copying package changelog" + cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" + have_changelog=1 + fi + + # tar it up + msg "Compressing package..." + cd "$startdir/pkg" + + pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" + comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" + [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" + + if ! tar czf $pkg_file $comp_files *; then + error "Failed to create package file." + exit 1 + fi +} + installpackage() { if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then msg "Installing package with pacman -U..." @@ -974,92 +1063,7 @@ find -depth -type d -empty -delete; fi -# get some package meta info -builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") -if [ "$PACKAGER" != "" ]; then - packager="$PACKAGER" -else - packager="Arch Linux (http://www.archlinux.org)" -fi -size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}') - -# build a filelist - do this first to keep meta files out of the list -msg "Generating .FILELIST file..." -cd "$startdir/pkg" -tar cvf /dev/null * | sort >.FILELIST - -# write the .PKGINFO file -msg "Generating .PKGINFO file..." -cd "$startdir/pkg" -echo "# Generated by makepkg $myver" >.PKGINFO -echo -n "# " >>.PKGINFO -date >>.PKGINFO -echo "pkgname = $pkgname" >>.PKGINFO -echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO -echo "pkgdesc = $pkgdesc" >>.PKGINFO -echo "url = $url" >>.PKGINFO -echo "builddate = $builddate" >>.PKGINFO -echo "packager = $packager" >>.PKGINFO -echo "size = $size" >>.PKGINFO -if [ "$CARCH" != "" ]; then - echo "arch = $CARCH" >>.PKGINFO -fi - -for it in "${license[@]}"; do - echo "license = $it" >>.PKGINFO -done -for it in "${replaces[@]}"; do - echo "replaces = $it" >>.PKGINFO -done -for it in "${groups[@]}"; do - echo "group = $it" >>.PKGINFO -done -for it in "${depends[@]}"; do - echo "depend = $it" >>.PKGINFO -done -for it in "${conflicts[@]}"; do - echo "conflict = $it" >>.PKGINFO -done -for it in "${provides[@]}"; do - echo "provides = $it" >>.PKGINFO -done -for it in "${backup[@]}"; do - echo "backup = $it" >>.PKGINFO -done - -# TODO maybe remove this at some point -# warn if license array is not present or empty -if [ "$license" = "" ]; then - warning "Please add a license line to your $BUILDSCRIPT!" - plain "example for GPL'ed software: license=('GPL')." -fi - -# check for an install script -if [ "$install" != "" ]; then - msg "Copying install script..." - cp "$startdir/$install" "$startdir/pkg/.INSTALL" -fi - -# do we have a changelog? -have_changelog=0 -if [ -f "$startdir/ChangeLog" ]; then - msg "Copying package changelog" - cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" - have_changelog=1 -fi - -# tar it up -msg "Compressing package..." -cd "$startdir/pkg" - -pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" -comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" -[ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" - -if ! tar czf $pkg_file $comp_files *; then - error "Failed to create package file." - exit 1 -fi +create_package cd "$startdir" if [ "$CLEANUP" = "1" ]; then ------------------------------------------------------------ revno: 5 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-create_package timestamp: Sun 2007-03-25 13:35:09 +0100 message: * cleaned up create_package() === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-25 12:25:18 +0000 +++ new/scripts/makepkg 2007-03-25 12:35:09 +0000 @@ -349,26 +349,26 @@ } create_package () { + cd "$startdir/pkg" + msg "Creating package..." + # get some package meta info - builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") + local builddate=$(LC_ALL= LANG= date -u "+%a %b %e %H:%M:%S %Y") if [ "$PACKAGER" != "" ]; then - packager="$PACKAGER" + local packager="$PACKAGER" else - packager="Arch Linux (http://www.archlinux.org)" + local packager="Arch Linux (http://www.archlinux.org)" fi - size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}') + local size=$(du -sb | awk '{print $1}') # build a filelist - do this first to keep meta files out of the list - msg "Generating .FILELIST file..." - cd "$startdir/pkg" - tar cvf /dev/null * | sort >.FILELIST + msg2 "Generating .FILELIST file..." + tar -cvf /dev/null * | sort >.FILELIST # write the .PKGINFO file - msg "Generating .PKGINFO file..." - cd "$startdir/pkg" + msg2 "Generating .PKGINFO file..." echo "# Generated by makepkg $myver" >.PKGINFO - echo -n "# " >>.PKGINFO - date >>.PKGINFO + echo "# $(LC_ALL= LANG= date -u)" >>.PKGINFO echo "pkgname = $pkgname" >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO @@ -380,6 +380,7 @@ echo "arch = $CARCH" >>.PKGINFO fi + local it for it in "${license[@]}"; do echo "license = $it" >>.PKGINFO done @@ -409,31 +410,31 @@ plain "example for GPL'ed software: license=('GPL')." fi + local comp_files + # check for an install script if [ "$install" != "" ]; then - msg "Copying install script..." - cp "$startdir/$install" "$startdir/pkg/.INSTALL" + msg2 "Copying install script..." + cp "$startdir/$install" .INSTALL + comp_files="$comp_files .INSTALL" fi # do we have a changelog? - have_changelog=0 if [ -f "$startdir/ChangeLog" ]; then - msg "Copying package changelog" - cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" - have_changelog=1 + msg2 "Copying package changelog" + cp "$startdir/ChangeLog" .CHANGELOG + comp_files="$comp_files .CHANGELOG" fi # tar it up - msg "Compressing package..." - cd "$startdir/pkg" - - pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" - comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" - [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" - - if ! tar czf $pkg_file $comp_files *; then + msg2 "Compressing package..." + + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}" + comp_files="$comp_files .PKGINFO .FILELIST" + + if ! tar -czf "$pkg_file" $comp_files *; then error "Failed to create package file." - exit 1 + exit 1 # TODO: error code fi } ------------------------------------------------------------ revno: 6 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-tidy_install timestamp: Sun 2007-03-25 13:44:23 +0100 message: * moved the following into tidy_install() - Remove info/doc files - Move usr/share/man to usr/man - Compress man pages - Strip binaries and libraries - Remove libtool files - Remove empty directories diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:39:05.156389252 +0100 +++ new/scripts/makepkg 2007-03-25 19:39:28.349710962 +0100 @@ -348,6 +348,67 @@ fi } +tidy_install () { + if [ "$(check_option docs)" = "n" ]; then + # remove info/doc files + msg "Removing info/doc files..." + cd "$startdir/pkg" + #fix flyspray bug #5021 + rm -rf ${DOC_DIRS[@]} + fi + + # move /usr/share/man files to /usr/man + if [ -d $startdir/pkg/usr/share/man ]; then + cd "$startdir" + mkdir -p pkg/usr/man + cp -a pkg/usr/share/man/* pkg/usr/man/ + rm -rf pkg/usr/share/man + fi + + # compress man pages + msg "Compressing man pages..." + find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do + ext="${i##*.}" + fn="${i##*/}" + if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then + # update symlinks to this manpage + find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do + rm -f "$ln" + ln -sf "${fn}.gz" "${ln}.gz" + done + # compress the original + gzip -9 "$i" + fi + done + + cd "$startdir" + + # strip binaries + if [ "$(check_option strip)" = "y" ]; then + msg "Stripping debugging symbols from libraries..." + find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ + -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ + | grep -v "No such file" | grep -v "format not recognized" + msg "Stripping symbols from binaries..." + find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ + -exec /usr/bin/strip '{}' \; 2>&1 \ + | grep -v "No such file" | grep -v "format not recognized" + fi + + # remove libtool (.la) files + if [ "$(check_option libtool)" = "n" ]; then + msg "Removing libtool .la files..." + find pkg -type f -name "*.la" -exec rm -f -- '{}' \; + fi + + # remove empty directories + if [ "$(check_option emptydirs)" = "n" ]; then + msg "Removing empty directories..." + cd "$startdir/pkg" + find -depth -type d -empty -delete; + fi +} + create_package () { cd "$startdir/pkg" msg "Creating package..." @@ -1005,64 +1066,7 @@ fi fi -if [ "$(check_option docs)" = "n" ]; then - # remove info/doc files - msg "Removing info/doc files..." - cd "$startdir/pkg" - #fix flyspray bug #5021 - rm -rf ${DOC_DIRS[@]} -fi - -# move /usr/share/man files to /usr/man -if [ -d $startdir/pkg/usr/share/man ]; then - cd "$startdir" - mkdir -p pkg/usr/man - cp -a pkg/usr/share/man/* pkg/usr/man/ - rm -rf pkg/usr/share/man -fi - -# compress man pages -msg "Compressing man pages..." -find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do - ext="${i##*.}" - fn="${i##*/}" - if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then - # update symlinks to this manpage - find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do - rm -f "$ln" - ln -sf "${fn}.gz" "${ln}.gz" - done - # compress the original - gzip -9 "$i" - fi -done - -cd "$startdir" - -# strip binaries -if [ "$(check_option strip)" = "y" ]; then - msg "Stripping debugging symbols from libraries..." - find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ - -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" - msg "Stripping symbols from binaries..." - find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ - -exec /usr/bin/strip '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" -fi - -# remove libtool (.la) files -if [ "$(check_option libtool)" = "n" ]; then - msg "Removing libtool .la files..." - find pkg -type f -name "*.la" -exec rm -f -- '{}' \; -fi - -# remove empty directories -if [ "$(check_option emptydirs)" = "n" ]; then - msg "Removing empty directories..." - cd "$startdir/pkg" - find -depth -type d -empty -delete; -fi +tidy_install create_package ------------------------------------------------------------ revno: 7 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-tidy_install timestamp: Sun 2007-03-25 13:53:16 +0100 message: * cleaned up tidy_install() * added 'LC_ALL=C LANG=C' to stip bin/lib find commands. On non en_US locales the greps can fail. === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-25 12:44:23 +0000 +++ new/scripts/makepkg 2007-03-25 12:53:16 +0000 @@ -349,62 +349,59 @@ } tidy_install () { + cd "$startdir/pkg" + msg "Tidying install..." + if [ "$(check_option docs)" = "n" ]; then - # remove info/doc files - msg "Removing info/doc files..." - cd "$startdir/pkg" + msg2 "Removing info/doc files..." #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} fi - # move /usr/share/man files to /usr/man - if [ -d $startdir/pkg/usr/share/man ]; then - cd "$startdir" - mkdir -p pkg/usr/man - cp -a pkg/usr/share/man/* pkg/usr/man/ - rm -rf pkg/usr/share/man + if [ -d usr/share/man ]; then + msg2 "Moving usr/share/man files to usr/man" + mkdir -p usr/man + cp -a usr/share/man/* usr/man/ + rm -rf usr/share/man fi - # compress man pages - msg "Compressing man pages..." - find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do - ext="${i##*.}" - fn="${i##*/}" + msg2 "Compressing man pages..." + local manpage ext file link + find {usr{,/local},opt/*}/man -type f 2>/dev/null | while read manpage ; do + ext="${manpage##*.}" + file="${manpage##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage - find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do - rm -f "$ln" - ln -sf "${fn}.gz" "${ln}.gz" + find {usr{,/local},opt/*}/man -lname "$file" 2>/dev/null | while read link ; do + rm -f "$link" + ln -sf "${file}.gz" "${link}.gz" done # compress the original - gzip -9 "$i" + gzip -9 "$manpage" fi done - cd "$startdir" - - # strip binaries if [ "$(check_option strip)" = "y" ]; then - msg "Stripping debugging symbols from libraries..." - find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ + msg2 "Stripping debugging symbols from libraries..." + LC_ALL=C LANG=C \ + find {.,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ | grep -v "No such file" | grep -v "format not recognized" - msg "Stripping symbols from binaries..." - find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ + + msg2 "Stripping symbols from binaries..." + LC_ALL=C LANG=C \ + find {.,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ -exec /usr/bin/strip '{}' \; 2>&1 \ | grep -v "No such file" | grep -v "format not recognized" fi - # remove libtool (.la) files if [ "$(check_option libtool)" = "n" ]; then - msg "Removing libtool .la files..." - find pkg -type f -name "*.la" -exec rm -f -- '{}' \; + msg2 "Removing libtool .la files..." + find -type f -name "*.la" -exec rm -f -- '{}' \; fi - # remove empty directories if [ "$(check_option emptydirs)" = "n" ]; then - msg "Removing empty directories..." - cd "$startdir/pkg" + msg2 "Removing empty directories..." find -depth -type d -empty -delete; fi } diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:42:10.990979362 +0100 +++ new/scripts/makepkg 2007-03-25 19:47:52.000000000 +0100 @@ -348,6 +348,68 @@ fi } +run_build () { + # use distcc if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then + [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH + elif [ "$(check_option distcc)" = "n" ]; then + # if it is not wanted, clear the makeflags too + export MAKEFLAGS="" + fi + + # use ccache if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then + [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH + fi + + # clear user-specified makeflags if requested + if [ "$(check_option makeflags)" = "n" ]; then + export MAKEFLAGS="" + fi + + # build + msg "Starting build()..." + + # some applications (eg, blackbox) will not build with some languages + unset LC_ALL LANG + umask 0022 + + #check for "exit on syntax error" shell option + echo $SHELLOPTS | grep errexit 2>&1 >/dev/null + set_e=$? + + ret=0 + if [ "$LOGGING" = "1" ]; then + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + if [ -f "$BUILDLOG" ]; then + i=1 + while true; do + if [ -f "$BUILDLOG.$i" ]; then + i=$(($i +1)) + else + break + fi + done + mv "$BUILDLOG" "$BUILDLOG.$i" + fi + + #use 'errexit' to bail on syntax error + [ $set_e -eq 1 ] && set -e + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + [ $set_e -eq 1 ] && set +e + else + #use 'errexit' to bail on syntax error + [ $set_e -eq 1 ] && set -e + build 2>&1 || ret=$? + [ $set_e -eq 1 ] && set +e + fi + if [ $ret -gt 0 ]; then + error "Build Failed. Aborting..." + removedeps + exit 2 + fi +} + tidy_install () { cd "$startdir/pkg" msg "Tidying install..." @@ -1002,65 +1064,7 @@ fi mkdir -p "$startdir/pkg" - # use distcc if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then - [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH - elif [ "$(check_option distcc)" = "n" ]; then - # if it is not wanted, clear the makeflags too - export MAKEFLAGS="" - fi - - # use ccache if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then - [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH - fi - - # clear user-specified makeflags if requested - if [ "$(check_option makeflags)" = "n" ]; then - export MAKEFLAGS="" - fi - - # build - msg "Starting build()..." - - # some applications (eg, blackbox) will not build with some languages - unset LC_ALL LANG - umask 0022 - - #check for "exit on syntax error" shell option - echo $SHELLOPTS | grep errexit 2>&1 >/dev/null - set_e=$? - - ret=0 - if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" - if [ -f "$BUILDLOG" ]; then - i=1 - while true; do - if [ -f "$BUILDLOG.$i" ]; then - i=$(($i +1)) - else - break - fi - done - mv "$BUILDLOG" "$BUILDLOG.$i" - fi - - #use 'errexit' to bail on syntax error - [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} - [ $set_e -eq 1 ] && set +e - else - #use 'errexit' to bail on syntax error - [ $set_e -eq 1 ] && set -e - build 2>&1 || ret=$? - [ $set_e -eq 1 ] && set +e - fi - if [ $ret -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi + run_build fi tidy_install ------------------------------------------------------------ revno: 9 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-run_build timestamp: Sun 2007-03-25 14:13:21 +0100 message: * cleaned up run_build. * restore LC_ALL and LANG after running build(). diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 20:13:25.241786827 +0100 +++ new/scripts/makepkg 2007-03-25 20:14:20.008907829 +0100 @@ -369,20 +369,22 @@ # build msg "Starting build()..." + cd "$startdir/src" # some applications (eg, blackbox) will not build with some languages - unset LC_ALL LANG + local _LC_ALL="$LC_ALL" ; LC_ALL='C' + local _LANG="$LANG" ; LANG='C' umask 0022 #check for "exit on syntax error" shell option echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$? - ret=0 + local ret=0 if [ "$LOGGING" = "1" ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" if [ -f "$BUILDLOG" ]; then - i=1 + local i=1 while true; do if [ -f "$BUILDLOG.$i" ]; then i=$(($i +1)) @@ -403,10 +405,15 @@ build 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e fi + + # restore locales + export LC_ALL="$_LC_ALL" + export LANG="$_LANG" + if [ $ret -gt 0 ]; then error "Build Failed. Aborting..." removedeps - exit 2 + exit 2 # TODO: error code fi } ------------------------------------------------------------ revno: 10 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-fakeroot timestamp: Sun 2007-03-25 14:31:05 +0100 message: * reduced use fakeroot to - run_build() - tidy_install() - create_package() * added check for inproper use of '-F'. * added yn_question() function. * added warning about running makepkg as root. diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:55:48.273553640 +0100 +++ new/scripts/makepkg 2007-03-25 19:56:02.738377944 +0100 @@ -41,6 +41,7 @@ DEP_SRC=0 SUDO=0 FORCE=0 +INFAKEROOT=0 GENINTEG=0 INSTALL=0 NOBUILD=0 @@ -52,14 +53,6 @@ PACMAN_OPTS= -#determine if we are running with fakeroot -if [ "$1" = "-F" ]; then - INFAKEROOT=1 - shift -else - INFAKEROOT=0 -fi - ### SUBROUTINES ### plain() { @@ -102,6 +95,24 @@ fi } +yn_question () { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -en " \033[1;1m$1\033[1;0m " >&2 + else + echo -n " $1 " >&2 + fi + + local answer + read answer + answer="$(echo $answer | tr [:upper:] [:lower:])" + + if [ "$answer" = 'y' -o "$answer" = 'yes' ]; then + return 0 + else + return 1 + fi +} + strip_url() { echo "$1" | sed 's|^.*://.*/||g' } @@ -675,7 +686,7 @@ exit 1 ;; -*) - while getopts "bcCdefghiLmop:rRsS-" opt; do + while getopts "bcCdefFghiLmop:rRsS-" opt; do case $opt in b) DEP_SRC=1 ;; c) CLEANUP=1 ;; @@ -683,6 +694,7 @@ d) NODEPS=1 ;; e) NOEXTRACT=1 ;; f) FORCE=1 ;; + F) INFAKEROOT=1 ;; g) GENINTEG=1 ;; h) usage @@ -751,6 +763,46 @@ fi fi +if [ "$INFAKEROOT" = "0" ]; then + if [ $EUID -eq 0 ]; then + # Warn those who like to live dangerously. + warning "Running makepkg as root is a \033[1;31mBAD\033[1;37m idea!" + plain "" + plain "Running makepkg as root can result in permanent, catastropic damage to " + plain "your system." + plain "" + if ! yn_question "Are you sure you want to continue? [N/y]"; then + error "Aborting..." + exit 1 # $E_USER_ABORT + fi + elif [ "$(check_buildenv fakeroot)" = "y" ]; then + if [ ! $(type -p fakeroot) ]; then + warning "Fakeroot is not installed. Building as an unprivileged user" + plain "will result in non-root ownership of the packaged files. Install" + plain "the fakeroot package to correctly build as a non-root user." + plain "" + if ! yn_question "Are you sure you want to continue? [N/y]"; then + error "Aborting..." + exit 1 # $E_USER_ABORT + fi + fi + else + warning "Running makepkg as an unprivileged user will result in non-root" + plain "ownership of the packaged files. Try using the fakeroot environment by" + plain "placing 'fakeroot' in the BUILDENV array in /etc/makepkg.conf" + plain "" + if ! yn_question "Are you sure you want to continue? [N/y]"; then + error "Aborting..." + exit 1 # $E_USER_ABORT + fi + fi +else + if [ "$FAKEROOTKEY" = "" ]; then + error "Do not use the '-F' option. This option is only for use by makepkg." + exit 1 # TODO: error code + fi +fi + unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force unset replaces depends conflicts backup source install build makedepends unset options noextract @@ -810,29 +862,20 @@ fi fi -# Enter the fakeroot environment if necessary. This will call the makepkg -# script again as the fake root user. We detect this by passing a sentinel -# option (-F) to makepkg. -if [ "$EUID" != "0" ]; then - if [ "$(check_buildenv fakeroot)" = "y" ]; then - if [ $(type -p fakeroot) ]; then - msg "Entering fakeroot environment" - fakeroot -- $0 -F $ARGLIST - exit $? - else - warning "Fakeroot is not installed. Building as an unprivileged user" - plain "will result in non-root ownership of the packaged files. Install" - plain "the fakeroot package to correctly build as a non-root user." - plain "" - sleep 1 - fi +# Run the bear minimum in fakeroot +# fix flyspray bug 6208 -- using makepkg with fakeroot gives an error +if [ "$INFAKEROOT" = "1" ]; then + if [ "$REPKG" = "1" ]; then + warning "Skipping build." else - warning "Running makepkg as an unprivileged user will result in non-root" - plain "ownership of the packaged files. Try using the fakeroot environment" - plain "by placing 'fakeroot' in the BUILDENV array in makepkg.conf." - plain "" - sleep 1 - fi + run_build + tidy_install + fi + + create_package + + msg "Leaveing fakeroot environment." + exit 0 # $E_OK fi msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" @@ -1061,22 +1104,34 @@ if [ "$NOBUILD" = "1" ]; then msg "Sources are ready." exit 0 -elif [ "$REPKG" = "1" ]; then - warning "Skipping build" else # check for existing pkg directory - if [ -d "$startdir/pkg" ]; then + if [ -d "$startdir/pkg" -a "$REPKG" = "0" ]; then msg "Removing existing pkg/ directory..." rm -rf "$startdir/pkg" fi mkdir -p "$startdir/pkg" - run_build -fi + if [ $EUID -eq 0 ]; then + if [ "$REPKG" = "1" ]; then + warning "Skipping build." + else + run_build + tidy_install + fi + + create_package + else + msg "Entering fakeroot environment..." + cd "$startdir" -tidy_install + ret=0 + fakeroot -- $0 -F $ARGLIST || ret=$? + [ $ret -ne 0 ] && exit $ret -create_package + unset ret + fi +fi cd "$startdir" if [ "$CLEANUP" = "1" ]; then ------------------------------------------------------------ revno: 11 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-fakeroot timestamp: Sun 2007-03-25 14:38:17 +0100 message: * removed fakeroot hacks from - handledeps() - removedeps() - installpackage() diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:57:18.006667240 +0100 +++ new/scripts/makepkg 2007-03-25 19:59:19.305579669 +0100 @@ -207,7 +207,7 @@ local depstrip="" local striplist="" local haveperm=0 - if [ $ "$EUID" = "0" -a "$INFAKEROOT" != "1" $ -o "$SUDO" = 1 ]; then + if [ "$EUID" = "0" -o "$SUDO" = 1 ]; then haveperm=1 fi @@ -220,21 +220,11 @@ if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then # install missing deps from binary packages (using pacman -S and sudo) msg "Installing missing dependencies..." - if [ "$INFAKEROOT" = "1" ]; then - # kinda hacky, but we need to make pacman think that we're NOT - # in fakeroot so it will go ahead and install the dependencies. - FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi sudo pacman $PACMAN_OPTS -S $striplist if [ $? -eq 1 ]; then error "Pacman failed to install missing dependencies." exit 1 fi - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi elif [ "$DEP_BIN" = "1" ]; then # install missing deps from binary packages (using pacman -S) msg "Installing missing dependencies..." @@ -344,15 +334,7 @@ if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi sudo pacman $PACMAN_OPTS -Rs $striplist - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." pacman $PACMAN_OPTS -Rs $striplist @@ -579,16 +561,8 @@ installpackage() { if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then msg "Installing package with pacman -U..." - if [ "$INFAKEROOT" = "1" ]; then - FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} local exitcode=$? - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi exit $exitcode elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then msg "Installing package with pacman -U..." ------------------------------------------------------------ revno: 12 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-fake_install timestamp: Sun 2007-03-25 14:46:38 +0100 message: * modify run_build() to run other functions. * add fake_install() support. diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 23:15:12.538842433 +0100 +++ new/scripts/makepkg 2007-03-25 23:16:46.192179436 +0100 @@ -342,6 +342,12 @@ } run_build () { + if [ "$(type -t $1)" != "function" ]; then + error "Unknown function '${1}'." + error "Aborting..." + exit 1 # TODO: error code + fi + # use distcc if it is requested (check buildenv and PKGBUILD opts) if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH @@ -361,7 +367,7 @@ fi # build - msg "Starting build()..." + msg "Starting ${1}()..." cd "$startdir/src" # some applications (eg, blackbox) will not build with some languages @@ -375,7 +381,7 @@ local ret=0 if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-${1}.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -390,12 +396,12 @@ #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + $1 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} [ $set_e -eq 1 ] && set +e else #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 || ret=$? + $1 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e fi @@ -842,7 +848,12 @@ if [ "$REPKG" = "1" ]; then warning "Skipping build." else - run_build + if [ "$(type -t fake_install)" != "function" ]; then + run_build build + else + run_build fake_install + fi + tidy_install fi @@ -1090,12 +1101,17 @@ if [ "$REPKG" = "1" ]; then warning "Skipping build." else - run_build + run_build build + [ "$(type -t fake_install)" = "function" ] && run_build fake_install tidy_install fi create_package else + if [ "$REPKG" = "0" -a "$(type -t fake_install)" = "function" ]; then + run_build build + fi + msg "Entering fakeroot environment..." cd "$startdir" @@ -1111,7 +1127,7 @@ if [ "$CLEANUP" = "1" ]; then msg "Cleaning up..." rm -rf src pkg - rm -rf ${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log* + rm -f ${pkgname}-${pkgver}-${pkgrel}-${CARCH}-{build,fake_install}.log* fi removedeps

2 2

[pacman-dev] pacman 3.0 in testing
by Aaron Griffin 28 Mar '07

28 Mar '07

Well, pacman 3.0 has gone to testing. It may take some time for everything to sync and all that jazz, but for those packagers using testing (and pacman 3.0) you will need an extra step for the time being when uploading packages. pacman will create packages tagged with the architecture, (i.e. pacman-3.0.0-1-i686.pkg.tar.gz) you will need to rename this WITHOUT the architecture until we update all the dev tools to use the new format (this includes the devtools package and the archlinux.org repo scripts). Enjoy! -- Aaron Griffin

6 6