March 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] makepkg with gettext support
by Giovanni Scafora 28 Mar '07

28 Mar '07

Hi guys, I send my initial work on makepkg with gettext support. I guess that it's not still perfect, but I would appreciate a lot the contribution of all the translators and the pacman developers. All the suggestions are appreciated. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 5

[pacman-dev] CVS update of pacman-lib/lib/libalpm (sync.c)
by Dan McGee 28 Mar '07

28 Mar '07

Date: Wednesday, March 28, 2007 @ 00:32:00 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: sync.c (1.112 -> 1.113) Fix --ignore behavior on sysupgrade * --ignore was being ignored (haha) on sysupgrade when a package was listed as being a force upgrade. This adds a prompt to the user in this case asking what to do. Signed-off-by: Dan McGee <dan(a)archlinux.org> --------+ sync.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.112 pacman-lib/lib/libalpm/sync.c:1.113 --- pacman-lib/lib/libalpm/sync.c:1.112 Tue Mar 20 23:08:19 2007 +++ pacman-lib/lib/libalpm/sync.c Wed Mar 28 00:32:00 2007 @@ -216,14 +216,22 @@ alpm_pkg_get_name(local), alpm_pkg_get_version(local), alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); if(!_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) { - pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(local), - alpm_pkg_get_version(local)); - if(dummy == NULL) { + /* If package is in the ignorepkg list, ask before we add it to + * the transaction */ + if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(local))) { + int resp = 0; + QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, local, NULL, NULL, &resp); + if(!resp) { + continue; + } + } + pmpkg_t *tmp = _alpm_pkg_dup(local); + if(tmp == NULL) { goto error; } - sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); + sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, tmp); if(sync == NULL) { - FREEPKG(dummy); + FREEPKG(tmp); goto error; } trans->packages = alpm_list_add(trans->packages, sync);

1 0

[pacman-dev] CVS update of pacman-lib/doc (pacman.conf.5)
by Dan McGee 27 Mar '07

27 Mar '07

Date: Tuesday, March 27, 2007 @ 11:51:18 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: pacman.conf.5 (1.3 -> 1.4) * Remove outdated ProxyServer option from pacman.conf.5. ---------------+ pacman.conf.5 | 3 --- 1 file changed, 3 deletions(-) Index: pacman-lib/doc/pacman.conf.5 diff -u pacman-lib/doc/pacman.conf.5:1.3 pacman-lib/doc/pacman.conf.5:1.4 --- pacman-lib/doc/pacman.conf.5:1.3 Thu Feb 22 22:23:07 2007 +++ pacman-lib/doc/pacman.conf.5 Tue Mar 27 11:51:18 2007 @@ -54,9 +54,6 @@ Include another config file. This file can include repositories or general configuration options. .TP -.B ProxyServer = <\fIhost\fP|\fIip\fP>[:\fIport\fP] -If set, \fBpacman\fP will use this proxy server for all ftp/http transfers. -.TP .B XferCommand = \fI/path/to/command %u\fP If set, an external program will be used to download all remote files. All instances of \fB%u\fP will be replaced with the download URL. If present,

1 0

[pacman-dev] makepkg using Proxy
by Gustavo Chain 27 Mar '07

27 Mar '07

Hi all! Dont' you think that makepkg should use ProxySettings from pacman.conf. ? What dou you think about ? -- Gustavo Chaín Dumit Alumno de Ingeniería de Ejecución Informática Pontificia Universidad Católica de Valparaiso http://aleph.homeunix.com/~gchain

4 6

[pacman-dev] makepkg FS#6708 patch
by Scott Horowitz 27 Mar '07

27 Mar '07

As per FS#6708, here is a patch against makepkg to download the first 50kb of the db.tar.gz file. Feel free to tweak the number, I thought it was a good balance between getting an accurate number and making dialup users wait. --- /usr/bin/rankmirrors 2007-03-25 20:07:04.000000000 -0600 +++ rankmirrors 2007-03-26 22:39:23.000000000 -0600 @@ -55,7 +55,8 @@ def talkToServer(serverUrl): opener = urllib2.build_opener() - tmp = opener.open(serverUrl).read() + # retrieve first 50,000 bytes only + tmp = opener.open(serverUrl).read(50000) def getFuncToTime(serverUrl): return lambda : talkToServer(serverUrl) @@ -139,8 +140,18 @@ elif options.times: print ' * ', sys.stdout.flush() + + # add db.tar.gz to server name + try: + splitted2 = serverUrl.split('/') + dbFileName = splitted2[len(splitted2) - 3] + '.db.tar.gz' + if serverUrl[-1] != '/': + dbFileName = '/' + dbFileName + except: + dbFileName = '' + try: - serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) + serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl + dbFileName)) if options.verbose: try: print "%.2f" % serverToTime[serverUrl]

1 2

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

26 Mar '07

Hi! This is a new patch for src/pacman/po/ru_RU.po Now it looks like finished translation. But improvements are welcome. Thanks a lot, shild <sxp(a)bk.ru>!

2 1

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

26 Mar '07

Date: Monday, March 26, 2007 @ 18:47:57 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.11 -> 1.12) src/pacman/po/ru_RU.po (1.6 -> 1.7) src/pacman/sync.c (1.117 -> 1.118) * Fix NEWS typo. Oops. * Updated Russian translation. Владимир Байраковский <4rayven(a)gmail.com> and Shild <sxp(a)bk.ru> * Removed a string from gettext that didn't need it. ------------------------+ NEWS | 2 - src/pacman/po/ru_RU.po | 54 ++++++++++++++++++++++++----------------------- src/pacman/sync.c | 2 - 3 files changed, 30 insertions(+), 28 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.11 pacman-lib/NEWS:1.12 --- pacman-lib/NEWS:1.11 Thu Mar 22 11:18:26 2007 +++ pacman-lib/NEWS Mon Mar 26 18:47:56 2007 @@ -47,7 +47,7 @@ - repo-add - adds a package to a repo database file - repo-remove - removes a package from a repo database file - added pactest testing suite - - MANY fixes and small inprovements everywhere + - MANY fixes and small improvements everywhere 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S Index: pacman-lib/src/pacman/po/ru_RU.po diff -u pacman-lib/src/pacman/po/ru_RU.po:1.6 pacman-lib/src/pacman/po/ru_RU.po:1.7 --- pacman-lib/src/pacman/po/ru_RU.po:1.6 Sat Mar 24 00:18:19 2007 +++ pacman-lib/src/pacman/po/ru_RU.po Mon Mar 26 18:47:57 2007 @@ -1,5 +1,5 @@ # Pacman Russian Translation -# Copyright (C) YEAR Judd Vinet <jvinet(a)zeroflux.org> +# Copyright (C) 2007 Judd Vinet <jvinet(a)zeroflux.org> # This file is distributed under the same license as the Pacman package. # Vladimir Bayrakovskiy <4rayven(a)gmail.com>, 2007 # @@ -7,12 +7,15 @@ 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" +"POT-Creation-Date: 2007-03-25 17:41+0600\n" "PO-Revision-Date: 2007-03-07 11:45-0500\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven(a)gmail.com>\n" +"Language-Team: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482 #: src/pacman/sync.c:531 @@ -31,7 +34,7 @@ #: src/pacman/add.c:83 #, c-format msgid "failed to add target '%s' (%s)" -msgstr "" +msgstr "не удалось добавить цель '%s' (%s)" #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 #: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105 @@ -115,11 +118,11 @@ #: src/pacman/log.c:194 msgid "Y" -msgstr "" +msgstr "Y" #: src/pacman/log.c:194 msgid "YES" -msgstr "" +msgstr "YES" #: src/pacman/log.h:30 msgid "error: " @@ -230,11 +233,11 @@ #: src/pacman/package.c:96 msgid "Yes" -msgstr "" +msgstr "Yes" #: src/pacman/package.c:96 msgid "No" -msgstr "" +msgstr "No" #: src/pacman/package.c:126 #, c-format @@ -303,7 +306,7 @@ #: src/pacman/pacman.c:91 #, c-format msgid " %s {-V --version}\n" -msgstr "" +msgstr " %s {-V --version}\n" #: src/pacman/pacman.c:92 #, c-format @@ -454,7 +457,7 @@ msgid "" " -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" -" -m, --foreign показать все пакеты не найденные в базе данных(s)\n" +" -m, --foreign показать все пакеты не найденные в базе(ах) данных\n" #: src/pacman/pacman.c:132 #, c-format @@ -465,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 @@ -474,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 @@ -506,8 +509,7 @@ #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list <repo> view a list of packages in a repo\n" -msgstr "" -" -l, --list <repo> показать список всех пакетов в репозитории repo\n" +msgstr " -l, --list <repo> показать все пакеты данного репозитория\n" #: src/pacman/pacman.c:146 #, c-format @@ -553,14 +555,14 @@ " --ignore <pkg> ignore a package upgrade (can be used more than " "once)\n" msgstr "" -" --ignore <pkg> игнорировать пакет при обновлении (может быть " +" --ignore <пакет> игнорировать пакет при обновлении (может быть " "использовано неоднократно)\n" #: src/pacman/pacman.c:153 #, c-format msgid " --config <path> set an alternate configuration file\n" msgstr "" -" --config <path> использовать альтернативный конфигурационный файл\n" +" --config <путь> использовать альтернативный конфигурационный файл\n" #: src/pacman/pacman.c:154 #, c-format @@ -572,7 +574,7 @@ msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" -" --ask <number> заранее подготовленные ответы на вопросы (смотрите " +" --ask <число> заранее подготовленные ответы на вопросы (смотрите " "man-страницу)\n" #: src/pacman/pacman.c:156 @@ -597,30 +599,30 @@ #, c-format msgid " -r, --root <path> set an alternate installation root\n" msgstr "" -" -r, --root <path> указать алтернативную корневую директорию для " +" -r, --root <путь> указать альтернативную корневую директорию для " "установки\n" #: src/pacman/pacman.c:160 #, c-format msgid " -b, --dbpath <path> set an alternate database location\n" msgstr "" -" -b, --dbpath <path> указать альтернативное расположение базы данных\n" +" -b, --dbpath <путь> указать альтернативное расположение базы данных\n" #: src/pacman/pacman.c:161 #, c-format msgid " --cachedir <dir> set an alternate package cache location\n" -msgstr "" -" --cachedir <директория> указать альтернативное расположение кэша\n" +msgstr " --cachedir <dir> указать альтернативное расположение кэша\n" #: src/pacman/pacman.c:174 #, c-format msgid " This program may be freely redistributed under\n" msgstr "" +" This program may be freely redistributed under\n" #: src/pacman/pacman.c:175 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr "" +msgstr " the terms of the GNU General Public License\n" #: src/pacman/pacman.c:300 #, c-format @@ -648,7 +650,7 @@ #: src/pacman/pacman.c:436 msgid "warning: current locale is invalid; using default \"C\" locale" -msgstr "" +msgstr "warning: current locale is invalid; using default \"C\" locale" #: src/pacman/pacman.c:456 #, c-format @@ -692,12 +694,12 @@ #: src/pacman/query.c:100 msgid "cannot determine ownership of a directory" -msgstr "не удается определить владельца директории" +msgstr "не удалось определить владельца каталога" #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "" +msgstr "не удалось определить настоящий путь для '%s': %s" #: src/pacman/query.c:119 #, c-format @@ -887,12 +889,12 @@ #: src/pacman/sync.c:537 #, c-format msgid "pacman: %s\n" -msgstr "" +msgstr "pacman: %s\n" #: src/pacman/sync.c:557 #, c-format msgid "'%s': %s\n" -msgstr "" +msgstr "'%s': %s\n" #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.117 pacman-lib/src/pacman/sync.c:1.118 --- pacman-lib/src/pacman/sync.c:1.117 Mon Mar 19 00:23:45 2007 +++ pacman-lib/src/pacman/sync.c Mon Mar 26 18:47:56 2007 @@ -554,7 +554,7 @@ continue; } if(pm_errno != PM_ERR_PKG_NOT_FOUND) { - ERR(NL, _("'%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno)); + ERR(NL, "'%s': %s\n", (char *)i->data, alpm_strerror(pm_errno)); retval = 1; goto cleanup; }

1 0

[pacman-dev] CVS update of pacman-lib (NEWS)
by Dan McGee 26 Mar '07

26 Mar '07

Date: Thursday, March 22, 2007 @ 11:18:26 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.10 -> 1.11) Roman Kyrylych <roman.kyrylych(a)gmail.com> * Updates to news file. ------+ NEWS | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.10 pacman-lib/NEWS:1.11 --- pacman-lib/NEWS:1.10 Tue Mar 20 01:47:11 2007 +++ pacman-lib/NEWS Thu Mar 22 11:18:26 2007 @@ -1,40 +1,53 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- 3.0.0 - first release based on libalpm backend - - added internationalization (gettext) support - - prompt to delete corrupted packages + - added internationalization (gettext) support: + - de, fr, hu, it, pt_BR, en_GB, ru_RU translations + - switch to usage of libdownload and libarchive + - improved proxy support using libdownload - documentation - man pages updated, new conf manpages added + - repository mirror list updates - added support for package changelogs - logging of all install scriptlet messages to pacman.log - - repository mirror list updates - orphans search (-Qe) now shows true orphans - - new -Qu option- show all packages that can be upgraded + - new -Qu option - show all packages that can be upgraded + - new -Se option - install only dependencies - dependency sorting on install and removal - - improved backup handling- backup array is proactive on upgrade - - new uncompressed size field, shown on sync upgrade - check for free space before installing packages + - prompt to delete corrupted packages + - improved backup handling - backup array proactive on upgrade + - removed NoUpgrade lines from default pacman.conf + - new uncompressed size field, shown on sync upgrade - improved progress and progressbar output - reduced unnecessary calling of ldconfig - selective loading of database to speed up certain operations - - switch to usage of libdownload and libarchive - - improved proxy support as a result of switch to libdownload - debugging output improved with --debug flag - - added 'rankmirrors' - script to show best available mirrors - - added 'repo-add' - the backbone script for building repos - - added pactest testing suite - - abs - supports cvsup/csup, expanded configuration - - abs - supports fetching of testing repository - - makepkg fixes: + - pacman-optimize - now supports DBs on separate filesystem + - makepkg and abs now support conf files in home directory + - makepkg changes: + - arch field is required + - added -arch suffix to generated package filenames - new configuration file options format + - changed default configuration - support alternate integrity checks - extract files using filetype, not extension - added noextract array + - new options array format - new option to log build process - - new repackage option - repackage pkg/ w/o building + - new --repackage option - repackage pkg/ without building - user-selectable paths for doc stripping - configurable source cache location - dependencies now removed on a build success or failure - - pacman-optimize - support DB's on separate filesystem + - abs changes: + - supports both cvsup and csup + - expanded configuration + - added support for testing repository + - new helper scripts: + - rankmirrors - shows best available mirrors + - repo-add - adds a package to a repo database file + - repo-remove - removes a package from a repo database file + - added pactest testing suite + - MANY fixes and small inprovements everywhere 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S

3 2

Re: [pacman-dev] pacman/xdelta using XferCommand
by Dale Ogilvie 26 Mar '07

26 Mar '07

> I agree; the XferCommand solution seems like an excellent way to > prototype this and see if it is feasible. As Aaron and I have alluded > to, we aren't real big on getting this done ourselves, but we will > offer suggestions if asked. Great. I'm asking for suggestions! I have verified that my makepkg patch works to create deltas of old versions placed by the packager in the build directory. The attached patch is for 2.9.8, as this is what I'm running on my system today. 3.0 just adds some $CARCH stuff, no big deal. I have verified that the download and patch from my own custom repo works using my custom XferCommand script. See attached. Where to from here? Some have suggested using another method rather than xdelta 1.1, bdiff/zsync/xdelta3 etc. I gave zsync a try but had to give up when it failed to download the files from my tomcat web server. Possibly it would work with apache, but it wasn't a good sign. I feel that there are quite a few more moving parts to the zsync solution which weigh against it. bdiff is reportedly a better xdelta - I personally think xdelta will do until proven otherwise. Dale

1 0

[pacman-dev] makepkg3 suggestions/thoughts
by Andrew Fyfe 26 Mar '07

26 Mar '07

* Remove the '--usesudo | -S' option. Instead always use sudo to calling pacman when an unprivileged user runs makepkg and spit out a warning (or error) if sudo is missing. Is sudo part of the base Arch Linux system? * Move common functions to a seperate file. plain, msg*, error, warning, in_array, check_* This has been brought up a few times, the last time it was suggested that the file should go in /usr/lib/archlinux/functions. (I think that was it). I'll make a patch if that's where they're going to go. Alternatively an autoconf option could be added to set the folder when pacman is built. * Move --cleancache into it's own script. (Or remove altogether) It's alot of code for 'rm $SRCDEST/*'. Do people use it? * Move BUILDSCRIPT="PKGBUILD" and PKGEXT="pkg.tar.gz" into makepkg.conf. They're used in a few scripts. * sha256 sha3.. sha512 WTFs wrong with md5 and sha1? Do we REALLY need these? If they must remain I demand the inclusion of CRC :p * Remove '--nocolor | -m' option. If you don't like colour switch it off in makepkg.conf :p Is it used? Andrew

2 1